Commit 29865841 authored May 13, 2014 by Wang Shilong Committed by Chris Mason Jun 09, 2014

Btrfs: set right total device count for seeding support



Seeding device support allows us to create a new filesystem
based on existed filesystem.

However newly created filesystem's @total_devices should include seed
devices. This patch fix the following problem:

 # mkfs.btrfs -f /dev/sdb
 # btrfstune -S 1 /dev/sdb
 # mount /dev/sdb /mnt
 # btrfs device add -f /dev/sdc /mnt --->fs_devices->total_devices = 1
 # umount /mnt
 # mount /dev/sdc /mnt               --->fs_devices->total_devices = 2

This is because we record right @total_devices in superblock, but
@fs_devices->total_devices is reset to be 0 in btrfs_prepare_sprout().

Fix this problem by not resetting @fs_devices->total_devices.

Signed-off-by: Wang Shilong <wangsl.fnst@cn.fujitsu.com>
Signed-off-by: Chris Mason <clm@fb.com>

parent 45ff35d6

fs/btrfs/volumes.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -1934,7 +1934,6 @@ static int btrfs_prepare_sprout(struct btrfs_root *root)
		fs_devices->seeding = 0;
		fs_devices->num_devices = 0;
		fs_devices->open_devices = 0;
		fs_devices->total_devices = 0;
		fs_devices->seed = seed_devices;

		generate_random_uuid(fs_devices->fsid);

Admin message