btrfs-progs: fix wrong message about forcing the mixed group profile
authorAnand Jain <anand.jain@oracle.com>
Tue, 15 Jul 2014 08:26:20 +0000 (16:26 +0800)
committerDavid Sterba <dsterba@suse.cz>
Fri, 22 Aug 2014 13:07:01 +0000 (15:07 +0200)
When the added disk is small, the function btrfs_prepare_device() would
print message indicating that mixed group is forced, apparently thats
not true

reproducer:

mkfs.btrfs -f -draid1 -mraid1 /dev/sdd /dev/sdc
::
SMALL VOLUME: forcing mixed metadata/data groups <---- WRONG

mount /dev/sdd /btrfs

btrfs fi df /btrfs
Data, RAID1: total=126.25MiB, used=128.00KiB
Data, single: total=8.00MiB, used=0.00B
System, RAID1: total=8.00MiB, used=16.00KiB
System, single: total=4.00MiB, used=0.00B
Metadata, RAID1: total=126.25MiB, used=112.00KiB
Metadata, single: total=8.00MiB, used=0.00B
GlobalReserve, single: total=16.00MiB, used=0.00B

Signed-off-by: Anand Jain <anand.jain@oracle.com>
Signed-off-by: David Sterba <dsterba@suse.cz>
utils.c

diff --git a/utils.c b/utils.c
index b7e4f74..18034e1 100644 (file)
--- a/utils.c
+++ b/utils.c
@@ -699,10 +699,8 @@ int btrfs_prepare_device(int fd, char *file, int zero_end, u64 *block_count_ret,
        if (max_block_count)
                block_count = min(block_count, max_block_count);
 
-       if (block_count < BTRFS_MKFS_SMALL_VOLUME_SIZE && !(*mixed)) {
-               printf("SMALL VOLUME: forcing mixed metadata/data groups\n");
+       if (block_count < BTRFS_MKFS_SMALL_VOLUME_SIZE && !(*mixed))
                *mixed = 1;
-       }
 
        if (discard) {
                /*