Commit 6941823c authored by Josef Bacik's avatar Josef Bacik Committed by David Sterba
Browse files

btrfs: remove old mount API code 



Now that we've switched to the new mount API, remove the old stuff.

Reviewed-by: default avatarJohannes Thumshirn <johannes.thumshirn@wdc.com>
Reviewed-by: default avatarAnand Jain <anand.jain@oracle.com>
Acked-by: default avatarChristian Brauner <brauner@kernel.org>
Signed-off-by: default avatarJosef Bacik <josef@toxicpanda.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 41d46b29

fs/btrfs/fs.h

+0 −14
Original line number Diff line number Diff line
@@ -962,20 +962,6 @@ void __btrfs_clear_fs_compat_ro(struct btrfs_fs_info *fs_info, u64 flag, 
#define btrfs_test_opt(fs_info, opt)	((fs_info)->mount_opt & \

					 BTRFS_MOUNT_##opt)



#define btrfs_set_and_info(fs_info, opt, fmt, args...)			\

do {									\

	if (!btrfs_test_opt(fs_info, opt))				\

		btrfs_info(fs_info, fmt, ##args);			\

	btrfs_set_opt(fs_info->mount_opt, opt);				\

} while (0)



#define btrfs_clear_and_info(fs_info, opt, fmt, args...)		\

do {									\

	if (btrfs_test_opt(fs_info, opt))				\

		btrfs_info(fs_info, fmt, ##args);			\

	btrfs_clear_opt(fs_info->mount_opt, opt);			\

} while (0)



static inline int btrfs_fs_closing(struct btrfs_fs_info *fs_info)

{

	/* Do it this way so we only ever do one test_bit in the normal case. */

fs/btrfs/super.c

+13 −1065

File changed.

Preview size limit exceeded, changes collapsed.

fs/btrfs/super.h

+0 −2
Original line number Diff line number Diff line
@@ -5,8 +5,6 @@ 


bool btrfs_check_options(struct btrfs_fs_info *info, unsigned long *mount_opt,

			 unsigned long flags);

int btrfs_parse_options(struct btrfs_fs_info *info, char *options,

			unsigned long new_flags);

int btrfs_sync_fs(struct super_block *sb, int wait);

char *btrfs_get_subvol_name_from_objectid(struct btrfs_fs_info *fs_info,

					  u64 subvol_objectid);