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

Commit 4bd1761b authored by Adam Borowski's avatar Adam Borowski Committed by Greg Kroah-Hartman
Browse files

btrfs: fix a bogus warning when converting only data or metadata 




[ Upstream commit 14506127979a5a3d0c5d9b4cc76ce9d4ec23b717 ]

If your filesystem has, eg, data:raid0 metadata:raid1, and you run "btrfs
balance -dconvert=raid1", the meta.target field will be uninitialized.
That's otherwise ok, as it's unused except for this warning.

Thus, let's use the existing set of raid levels for the comparison.

As a side effect, non-convert balances will now nag about data>metadata.

Signed-off-by: default avatarAdam Borowski <kilobyte@angband.pl>
Reviewed-by: default avatarLiu Bo <bo.li.liu@oracle.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarSasha Levin <alexander.levin@microsoft.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 355edc25

fs/btrfs/volumes.c

+9 −3
Original line number Diff line number Diff line
@@ -3765,6 +3765,7 @@ int btrfs_balance(struct btrfs_balance_control *bctl, 
		  struct btrfs_ioctl_balance_args *bargs)

{

	struct btrfs_fs_info *fs_info = bctl->fs_info;

	u64 meta_target, data_target;

	u64 allowed;

	int mixed = 0;

	int ret;
@@ -3861,11 +3862,16 @@ int btrfs_balance(struct btrfs_balance_control *bctl, 
		}

	} while (read_seqretry(&fs_info->profiles_lock, seq));



	if (btrfs_get_num_tolerated_disk_barrier_failures(bctl->meta.target) <

		btrfs_get_num_tolerated_disk_barrier_failures(bctl->data.target)) {

	/* if we're not converting, the target field is uninitialized */

	meta_target = (bctl->meta.flags & BTRFS_BALANCE_ARGS_CONVERT) ?

		bctl->meta.target : fs_info->avail_metadata_alloc_bits;

	data_target = (bctl->data.flags & BTRFS_BALANCE_ARGS_CONVERT) ?

		bctl->data.target : fs_info->avail_data_alloc_bits;

	if (btrfs_get_num_tolerated_disk_barrier_failures(meta_target) <

		btrfs_get_num_tolerated_disk_barrier_failures(data_target)) {

		btrfs_warn(fs_info,

			   "metadata profile 0x%llx has lower redundancy than data profile 0x%llx",

			   bctl->meta.target, bctl->data.target);

			   meta_target, data_target);

	}



	if (bctl->sys.flags & BTRFS_BALANCE_ARGS_CONVERT) {