Commit cbeaae4f authored by David Sterba's avatar David Sterba
Browse files

btrfs: shorten integrity checker extent data mount option 



Subjectively, CHECK_INTEGRITY_INCLUDING_EXTENT_DATA is quite long and
calling it CHECK_INTEGRITY_DATA still keeps the meaning and matches the
mount option name.

Reviewed-by: default avatarAnand Jain <anand.jain@oracle.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent ccd9395b

fs/btrfs/ctree.h

+1 −1
Original line number Diff line number Diff line
@@ -1405,7 +1405,7 @@ enum { 
	BTRFS_MOUNT_USEBACKUPROOT		= (1UL << 17),

	BTRFS_MOUNT_SKIP_BALANCE		= (1UL << 18),

	BTRFS_MOUNT_CHECK_INTEGRITY		= (1UL << 19),

	BTRFS_MOUNT_CHECK_INTEGRITY_INCLUDING_EXTENT_DATA = (1UL << 20),

	BTRFS_MOUNT_CHECK_INTEGRITY_DATA	= (1UL << 20),

	BTRFS_MOUNT_PANIC_ON_FATAL_ERROR	= (1UL << 21),

	BTRFS_MOUNT_RESCAN_UUID_TREE		= (1UL << 22),

	BTRFS_MOUNT_FRAGMENT_DATA		= (1UL << 23),

fs/btrfs/disk-io.c

+1 −2
Original line number Diff line number Diff line
@@ -3598,8 +3598,7 @@ int __cold open_ctree(struct super_block *sb, struct btrfs_fs_devices *fs_device 
	if (btrfs_test_opt(fs_info, CHECK_INTEGRITY)) {

		ret = btrfsic_mount(fs_info, fs_devices,

				    btrfs_test_opt(fs_info,

					CHECK_INTEGRITY_INCLUDING_EXTENT_DATA) ?

				    1 : 0,

					CHECK_INTEGRITY_DATA) ? 1 : 0,

				    fs_info->check_integrity_print_mask);

		if (ret)

			btrfs_warn(fs_info,

fs/btrfs/super.c

+2 −3
Original line number Diff line number Diff line
@@ -934,8 +934,7 @@ int btrfs_parse_options(struct btrfs_fs_info *info, char *options, 
		case Opt_check_integrity_including_extent_data:

			btrfs_info(info,

				   "enabling check integrity including extent data");

			btrfs_set_opt(info->mount_opt,

				      CHECK_INTEGRITY_INCLUDING_EXTENT_DATA);

			btrfs_set_opt(info->mount_opt, CHECK_INTEGRITY_DATA);

			btrfs_set_opt(info->mount_opt, CHECK_INTEGRITY);

			break;

		case Opt_check_integrity:
@@ -1516,7 +1515,7 @@ static int btrfs_show_options(struct seq_file *seq, struct dentry *dentry) 
	if (btrfs_test_opt(info, SKIP_BALANCE))

		seq_puts(seq, ",skip_balance");

#ifdef CONFIG_BTRFS_FS_CHECK_INTEGRITY

	if (btrfs_test_opt(info, CHECK_INTEGRITY_INCLUDING_EXTENT_DATA))

	if (btrfs_test_opt(info, CHECK_INTEGRITY_DATA))

		seq_puts(seq, ",check_int_data");

	else if (btrfs_test_opt(info, CHECK_INTEGRITY))

		seq_puts(seq, ",check_int");