torvalds/linux
torvalds/linux
2
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-09-04 20:19:47 +08:00
Code

fs: simplify setup_bdev_super() calls

Browse Source 
There's no need to drop s_umount anymore now that we removed all sources
where s_umount is taken beneath open_mutex or bd_holder_lock.

Link: https://lore.kernel.org/r/20231024-vfs-super-rework-v1-1-37a8aa697148@kernel.org
Reviewed-by: Jan Kara <jack@suse.cz>
Signed-off-by: Christian Brauner <brauner@kernel.org>
This commit is contained in:
Christian Brauner 2023-10-24 16:53:39 +02:00
parent e419cf3eba
commit 761c47a973
No known key found for this signature in database
GPG Key ID: 91C61BC06578DCA2
1 changed files with 0 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
fs/super.c
View File

@ -1601,15 +1601,7 @@ int get_tree_bdev(struct fs_context *fc,
return -EBUSY; return -EBUSY;
} }
} else { } else {
/*
* We drop s_umount here because we need to open the bdev and
* bdev->open_mutex ranks above s_umount (blkdev_put() ->
* bdev_mark_dead()). It is safe because we have active sb
* reference and SB_BORN is not set yet.
*/
super_unlock_excl(s);
error = setup_bdev_super(s, fc->sb_flags, fc); error = setup_bdev_super(s, fc->sb_flags, fc);
__super_lock_excl(s);
if (!error) if (!error)
error = fill_super(s, fc); error = fill_super(s, fc);
if (error) { if (error) {
@ -1653,15 +1645,7 @@ struct dentry *mount_bdev(struct file_system_type *fs_type,
return ERR_PTR(-EBUSY); return ERR_PTR(-EBUSY);
} }
} else { } else {
/*
* We drop s_umount here because we need to open the bdev and
* bdev->open_mutex ranks above s_umount (blkdev_put() ->
* bdev_mark_dead()). It is safe because we have active sb
* reference and SB_BORN is not set yet.
*/
super_unlock_excl(s);
error = setup_bdev_super(s, flags, NULL); error = setup_bdev_super(s, flags, NULL);
__super_lock_excl(s);
if (!error) if (!error)
error = fill_super(s, data, flags & SB_SILENT ? 1 : 0); error = fill_super(s, data, flags & SB_SILENT ? 1 : 0);
if (error) { if (error) {