Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9d89ce65 authored by Wang Shilong's avatar Wang Shilong Committed by Chris Mason
Browse files

Btrfs: move btrfs_{set,clear}_and_info() to ctree.h 



Signed-off-by: default avatarWang Shilong <wangsl.fnst@cn.fujitsu.com>
Signed-off-by: default avatarChris Mason <clm@fb.com>
parent 3f9e3df8

fs/btrfs/ctree.h

+14 −0
Original line number Diff line number Diff line
@@ -2058,6 +2058,20 @@ struct btrfs_ioctl_defrag_range_args { 
#define btrfs_raw_test_opt(o, opt)	((o) & BTRFS_MOUNT_##opt)

#define btrfs_test_opt(root, opt)	((root)->fs_info->mount_opt & \

					 BTRFS_MOUNT_##opt)

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

{									\

	if (!btrfs_test_opt(root, opt))					\

		btrfs_info(root->fs_info, fmt, ##args);			\

	btrfs_set_opt(root->fs_info->mount_opt, opt);			\

}



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

{									\

	if (btrfs_test_opt(root, opt))					\

		btrfs_info(root->fs_info, fmt, ##args);			\

	btrfs_clear_opt(root->fs_info->mount_opt, opt);			\

}



/*

 * Inode flags

 */

fs/btrfs/super.c

+0 −14
Original line number Diff line number Diff line
@@ -385,20 +385,6 @@ static match_table_t tokens = { 
	{Opt_err, NULL},

};



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

{									\

	if (!btrfs_test_opt(root, opt))					\

		btrfs_info(root->fs_info, fmt, ##args);			\

	btrfs_set_opt(root->fs_info->mount_opt, opt);			\

}



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

{									\

	if (btrfs_test_opt(root, opt))					\

		btrfs_info(root->fs_info, fmt, ##args);			\

	btrfs_clear_opt(root->fs_info->mount_opt, opt);			\

}



/*

 * Regular mount options parser.  Everything that is needed only when

 * reading in a new superblock is parsed here.