Commit 2ea6f689 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Christian Brauner
Browse files

fs: use the super_block as holder when mounting file systems 



The file system type is not a very useful holder as it doesn't allow us
to go back to the actual file system instance.  Pass the super_block instead
which is useful when passed back to the file system driver.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarJan Kara <jack@suse.cz>
Reviewed-by: default avatarChristian Brauner <brauner@kernel.org>
Message-Id: <20230802154131.2221419-7-hch@lst.de>
Signed-off-by: default avatarChristian Brauner <brauner@kernel.org>
parent 4b41828b

fs/cramfs/inode.c

+1 −1
Original line number Diff line number Diff line
@@ -494,7 +494,7 @@ static void cramfs_kill_sb(struct super_block *sb) 
		sb->s_mtd = NULL;

	} else if (IS_ENABLED(CONFIG_CRAMFS_BLOCKDEV) && sb->s_bdev) {

		sync_blockdev(sb->s_bdev);

		blkdev_put(sb->s_bdev, sb->s_type);

		blkdev_put(sb->s_bdev, sb);

	}

	kfree(sbi);

}

fs/f2fs/super.c

+3 −4
Original line number Diff line number Diff line
@@ -1561,7 +1561,7 @@ static void destroy_device_list(struct f2fs_sb_info *sbi) 
	int i;



	for (i = 0; i < sbi->s_ndevs; i++) {

		blkdev_put(FDEV(i).bdev, sbi->sb->s_type);

		blkdev_put(FDEV(i).bdev, sbi->sb);

#ifdef CONFIG_BLK_DEV_ZONED

		kvfree(FDEV(i).blkz_seq);

#endif
@@ -4198,7 +4198,7 @@ static int f2fs_scan_devices(struct f2fs_sb_info *sbi) 
			/* Single zoned block device mount */

			FDEV(0).bdev =

				blkdev_get_by_dev(sbi->sb->s_bdev->bd_dev, mode,

						  sbi->sb->s_type, NULL);

						  sbi->sb, NULL);

		} else {

			/* Multi-device mount */

			memcpy(FDEV(i).path, RDEV(i).path, MAX_PATH_LEN);
@@ -4217,8 +4217,7 @@ static int f2fs_scan_devices(struct f2fs_sb_info *sbi) 
					sbi->log_blocks_per_seg) - 1;

			}

			FDEV(i).bdev = blkdev_get_by_path(FDEV(i).path, mode,

							  sbi->sb->s_type,

							  NULL);

							  sbi->sb, NULL);

		}

		if (IS_ERR(FDEV(i).bdev))

			return PTR_ERR(FDEV(i).bdev);

fs/romfs/super.c

+1 −1
Original line number Diff line number Diff line
@@ -594,7 +594,7 @@ static void romfs_kill_sb(struct super_block *sb) 
#ifdef CONFIG_ROMFS_ON_BLOCK

	if (sb->s_bdev) {

		sync_blockdev(sb->s_bdev);

		blkdev_put(sb->s_bdev, sb->s_type);

		blkdev_put(sb->s_bdev, sb);

	}

#endif

}

fs/super.c

+4 −4
Original line number Diff line number Diff line
@@ -1249,7 +1249,7 @@ int setup_bdev_super(struct super_block *sb, int sb_flags, 
	blk_mode_t mode = sb_open_mode(sb_flags);

	struct block_device *bdev;



	bdev = blkdev_get_by_dev(sb->s_dev, mode, sb->s_type, &fs_holder_ops);

	bdev = blkdev_get_by_dev(sb->s_dev, mode, sb, &fs_holder_ops);

	if (IS_ERR(bdev)) {

		if (fc)

			errorf(fc, "%s: Can't open blockdev", fc->source);
@@ -1262,7 +1262,7 @@ int setup_bdev_super(struct super_block *sb, int sb_flags, 
	 * writable from userspace even for a read-only block device.

	 */

	if ((mode & BLK_OPEN_WRITE) && bdev_read_only(bdev)) {

		blkdev_put(bdev, sb->s_type);

		blkdev_put(bdev, sb);

		return -EACCES;

	}
@@ -1278,7 +1278,7 @@ int setup_bdev_super(struct super_block *sb, int sb_flags, 
		mutex_unlock(&bdev->bd_fsfreeze_mutex);

		if (fc)

			warnf(fc, "%pg: Can't mount, blockdev is frozen", bdev);

		blkdev_put(bdev, sb->s_type);

		blkdev_put(bdev, sb);

		return -EBUSY;

	}

	spin_lock(&sb_lock);
@@ -1415,7 +1415,7 @@ void kill_block_super(struct super_block *sb) 
	generic_shutdown_super(sb);

	if (bdev) {

		sync_blockdev(bdev);

		blkdev_put(bdev, sb->s_type);

		blkdev_put(bdev, sb);

	}

}

fs/xfs/xfs_buf.c

+1 −1
Original line number Diff line number Diff line
@@ -1948,7 +1948,7 @@ xfs_free_buftarg( 
	fs_put_dax(btp->bt_daxdev, btp->bt_mount);

	/* the main block device is closed by kill_block_super */

	if (bdev != btp->bt_mount->m_super->s_bdev)

		blkdev_put(bdev, btp->bt_mount);

		blkdev_put(bdev, btp->bt_mount->m_super);



	kmem_free(btp);

}