From: Christoph Hellwig <hch@lst.de>
To: Jens Axboe <axboe@kernel.dk>
Cc: Al Viro <viro@zeniv.linux.org.uk>,
Christian Brauner <brauner@kernel.org>,
"Darrick J. Wong" <djwong@kernel.org>, Jan Kara <jack@suse.cz>,
linux-block@vger.kernel.org, linux-fsdevel@vger.kernel.org,
linux-xfs@vger.kernel.org
Subject: [PATCH 12/13] xfs: wire up sops->shutdown
Date: Thu, 18 May 2023 06:23:21 +0200 [thread overview]
Message-ID: <20230518042323.663189-13-hch@lst.de> (raw)
In-Reply-To: <20230518042323.663189-1-hch@lst.de>
Wire up the shutdown method to shut down the file system when the
underlying block device is marked dead. Add a new message to
clearly distinguish this shutdown reason from other shutdowns.
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
fs/xfs/xfs_fsops.c | 3 +++
fs/xfs/xfs_mount.h | 4 +++-
fs/xfs/xfs_super.c | 8 ++++++++
3 files changed, 14 insertions(+), 1 deletion(-)
diff --git a/fs/xfs/xfs_fsops.c b/fs/xfs/xfs_fsops.c
index 13851c0d640bc8..9ebb8333a30800 100644
--- a/fs/xfs/xfs_fsops.c
+++ b/fs/xfs/xfs_fsops.c
@@ -534,6 +534,9 @@ xfs_do_force_shutdown(
} else if (flags & SHUTDOWN_CORRUPT_ONDISK) {
tag = XFS_PTAG_SHUTDOWN_CORRUPT;
why = "Corruption of on-disk metadata";
+ } else if (flags & SHUTDOWN_DEVICE_REMOVED) {
+ tag = XFS_PTAG_SHUTDOWN_IOERROR;
+ why = "Block device removal";
} else {
tag = XFS_PTAG_SHUTDOWN_IOERROR;
why = "Metadata I/O Error";
diff --git a/fs/xfs/xfs_mount.h b/fs/xfs/xfs_mount.h
index aaaf5ec13492d2..429a5e12c1036e 100644
--- a/fs/xfs/xfs_mount.h
+++ b/fs/xfs/xfs_mount.h
@@ -457,12 +457,14 @@ void xfs_do_force_shutdown(struct xfs_mount *mp, uint32_t flags, char *fname,
#define SHUTDOWN_FORCE_UMOUNT (1u << 2) /* shutdown from a forced unmount */
#define SHUTDOWN_CORRUPT_INCORE (1u << 3) /* corrupt in-memory structures */
#define SHUTDOWN_CORRUPT_ONDISK (1u << 4) /* corrupt metadata on device */
+#define SHUTDOWN_DEVICE_REMOVED (1u << 5) /* device removed underneath us */
#define XFS_SHUTDOWN_STRINGS \
{ SHUTDOWN_META_IO_ERROR, "metadata_io" }, \
{ SHUTDOWN_LOG_IO_ERROR, "log_io" }, \
{ SHUTDOWN_FORCE_UMOUNT, "force_umount" }, \
- { SHUTDOWN_CORRUPT_INCORE, "corruption" }
+ { SHUTDOWN_CORRUPT_INCORE, "corruption" }, \
+ { SHUTDOWN_DEVICE_REMOVED, "device_removed" }
/*
* Flags for xfs_mountfs
diff --git a/fs/xfs/xfs_super.c b/fs/xfs/xfs_super.c
index 5684c538eb76dc..eb469b8f9a0497 100644
--- a/fs/xfs/xfs_super.c
+++ b/fs/xfs/xfs_super.c
@@ -1159,6 +1159,13 @@ xfs_fs_free_cached_objects(
return xfs_reclaim_inodes_nr(XFS_M(sb), sc->nr_to_scan);
}
+static void
+xfs_fs_shutdown(
+ struct super_block *sb)
+{
+ xfs_force_shutdown(XFS_M(sb), SHUTDOWN_DEVICE_REMOVED);
+}
+
static const struct super_operations xfs_super_operations = {
.alloc_inode = xfs_fs_alloc_inode,
.destroy_inode = xfs_fs_destroy_inode,
@@ -1172,6 +1179,7 @@ static const struct super_operations xfs_super_operations = {
.show_options = xfs_fs_show_options,
.nr_cached_objects = xfs_fs_nr_cached_objects,
.free_cached_objects = xfs_fs_free_cached_objects,
+ .shutdown = xfs_fs_shutdown,
};
static int
--
2.39.2
next prev parent reply other threads:[~2023-05-18 4:24 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-18 4:23 introduce bdev holder ops and a file system shutdown method v2 Christoph Hellwig
2023-05-18 4:23 ` [PATCH 01/13] block: factor out a bd_end_claim helper from blkdev_put Christoph Hellwig
2023-05-18 4:23 ` [PATCH 02/13] block: refactor bd_may_claim Christoph Hellwig
2023-05-30 11:41 ` Jan Kara
2023-06-01 8:11 ` Christoph Hellwig
2023-06-01 9:58 ` Jan Kara
2023-05-18 4:23 ` [PATCH 03/13] block: turn bdev_lock into a mutex Christoph Hellwig
2023-05-18 4:23 ` [PATCH 04/13] block: consolidate the shutdown logic in blk_mark_disk_dead and del_gendisk Christoph Hellwig
2023-05-30 11:58 ` Jan Kara
2023-05-18 4:23 ` [PATCH 05/13] block: avoid repeated work in blk_mark_disk_dead Christoph Hellwig
2023-05-18 4:23 ` [PATCH 06/13] block: unhash the inode earlier in delete_partition Christoph Hellwig
2023-05-30 12:09 ` Jan Kara
2023-05-18 4:23 ` [PATCH 07/13] block: delete partitions later in del_gendisk Christoph Hellwig
2023-05-30 12:55 ` Jan Kara
2023-05-18 4:23 ` [PATCH 08/13] block: remove blk_drop_partitions Christoph Hellwig
2023-05-30 12:56 ` Jan Kara
2023-05-18 4:23 ` [PATCH 09/13] block: introduce holder ops Christoph Hellwig
2023-05-30 13:03 ` Jan Kara
2023-05-18 4:23 ` [PATCH 10/13] block: add a mark_dead holder operation Christoph Hellwig
2023-05-30 13:05 ` Jan Kara
2023-05-18 4:23 ` [PATCH 11/13] fs: add a method to shut down the file system Christoph Hellwig
2023-05-18 4:23 ` Christoph Hellwig [this message]
2023-05-18 5:03 ` [PATCH 12/13] xfs: wire up sops->shutdown Darrick J. Wong
2023-05-18 4:23 ` [PATCH 13/13] xfs: wire up the ->mark_dead holder operation for log and RT devices Christoph Hellwig
2023-05-18 5:40 ` Dave Chinner
2023-05-19 2:00 ` introduce bdev holder ops and a file system shutdown method v2 Theodore Ts'o
2023-05-19 4:11 ` Christoph Hellwig
2023-05-23 0:58 ` Darrick J. Wong
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230518042323.663189-13-hch@lst.de \
--to=hch@lst.de \
--cc=axboe@kernel.dk \
--cc=brauner@kernel.org \
--cc=djwong@kernel.org \
--cc=jack@suse.cz \
--cc=linux-block@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-xfs@vger.kernel.org \
--cc=viro@zeniv.linux.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).