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 11/16] fs: add a method to shut down the file system
Date: Thu, 1 Jun 2023 11:44:54 +0200 [thread overview]
Message-ID: <20230601094459.1350643-12-hch@lst.de> (raw)
In-Reply-To: <20230601094459.1350643-1-hch@lst.de>
Add a new ->shutdown super operation that can be used to tell the file
system to shut down, and call it from newly created holder ops when the
block device under a file system shuts down.
This only covers the main block device for "simple" file systems using
get_tree_bdev / mount_bdev. File systems their own get_tree method
or opening additional devices will need to set up their own
blk_holder_ops.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Christian Brauner <brauner@kernel.org>
Reviewed-by: Jan Kara <jack@suse.cz>
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
---
fs/super.c | 21 +++++++++++++++++++--
include/linux/fs.h | 1 +
2 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/fs/super.c b/fs/super.c
index 012ce140080375..f127589700ab25 100644
--- a/fs/super.c
+++ b/fs/super.c
@@ -1206,6 +1206,22 @@ int get_tree_keyed(struct fs_context *fc,
EXPORT_SYMBOL(get_tree_keyed);
#ifdef CONFIG_BLOCK
+static void fs_mark_dead(struct block_device *bdev)
+{
+ struct super_block *sb;
+
+ sb = get_super(bdev);
+ if (!sb)
+ return;
+
+ if (sb->s_op->shutdown)
+ sb->s_op->shutdown(sb);
+ drop_super(sb);
+}
+
+static const struct blk_holder_ops fs_holder_ops = {
+ .mark_dead = fs_mark_dead,
+};
static int set_bdev_super(struct super_block *s, void *data)
{
@@ -1248,7 +1264,8 @@ int get_tree_bdev(struct fs_context *fc,
if (!fc->source)
return invalf(fc, "No source specified");
- bdev = blkdev_get_by_path(fc->source, mode, fc->fs_type, NULL);
+ bdev = blkdev_get_by_path(fc->source, mode, fc->fs_type,
+ &fs_holder_ops);
if (IS_ERR(bdev)) {
errorf(fc, "%s: Can't open blockdev", fc->source);
return PTR_ERR(bdev);
@@ -1333,7 +1350,7 @@ struct dentry *mount_bdev(struct file_system_type *fs_type,
if (!(flags & SB_RDONLY))
mode |= FMODE_WRITE;
- bdev = blkdev_get_by_path(dev_name, mode, fs_type, NULL);
+ bdev = blkdev_get_by_path(dev_name, mode, fs_type, &fs_holder_ops);
if (IS_ERR(bdev))
return ERR_CAST(bdev);
diff --git a/include/linux/fs.h b/include/linux/fs.h
index 08ba2ae1d3ce97..7b2053649820cc 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -1932,6 +1932,7 @@ struct super_operations {
struct shrink_control *);
long (*free_cached_objects)(struct super_block *,
struct shrink_control *);
+ void (*shutdown)(struct super_block *sb);
};
/*
--
2.39.2
next prev parent reply other threads:[~2023-06-01 9:46 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-01 9:44 introduce bdev holder ops and a file system shutdown method v3 Christoph Hellwig
2023-06-01 9:44 ` [PATCH 01/16] block: factor out a bd_end_claim helper from blkdev_put Christoph Hellwig
2023-06-01 9:44 ` [PATCH 02/16] block: refactor bd_may_claim Christoph Hellwig
2023-06-01 9:44 ` [PATCH 03/16] block: turn bdev_lock into a mutex Christoph Hellwig
2023-06-01 9:44 ` [PATCH 04/16] block: consolidate the shutdown logic in blk_mark_disk_dead and del_gendisk Christoph Hellwig
2023-06-01 9:44 ` [PATCH 05/16] block: avoid repeated work in blk_mark_disk_dead Christoph Hellwig
2023-06-01 9:44 ` [PATCH 06/16] block: unhash the inode earlier in delete_partition Christoph Hellwig
2023-06-01 9:44 ` [PATCH 07/16] block: delete partitions later in del_gendisk Christoph Hellwig
2023-06-01 9:44 ` [PATCH 08/16] block: remove blk_drop_partitions Christoph Hellwig
2023-06-01 9:44 ` [PATCH 09/16] block: introduce holder ops Christoph Hellwig
2023-06-01 9:44 ` [PATCH 10/16] block: add a mark_dead holder operation Christoph Hellwig
2023-06-01 9:44 ` Christoph Hellwig [this message]
2023-06-01 9:44 ` [PATCH 12/16] xfs: wire up sops->shutdown Christoph Hellwig
2023-06-01 9:44 ` [PATCH 13/16] xfs: wire up the ->mark_dead holder operation for log and RT devices Christoph Hellwig
2023-06-01 9:44 ` [PATCH 14/16] ext4: split ext4_shutdown Christoph Hellwig
2023-06-01 10:10 ` Jan Kara
2023-06-01 9:44 ` [PATCH 15/16] ext4: wire up sops->shutdown Christoph Hellwig
2023-06-01 10:10 ` Jan Kara
2023-06-01 9:44 ` [PATCH 16/16] ext4: wire up the ->mark_dead holder operation for log devices Christoph Hellwig
2023-06-01 10:11 ` Jan Kara
2023-06-01 21:48 ` introduce bdev holder ops and a file system shutdown method v3 Dave Chinner
2023-06-05 17:22 ` Jens Axboe
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=20230601094459.1350643-12-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).