diff options
| author | Wang Shilong <wangsl.fnst@cn.fujitsu.com> | 2014-05-13 17:05:06 +0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-06-30 20:12:01 -0700 |
| commit | 0da608d5f9df9385c2afbb7534d39e557328f6da (patch) | |
| tree | 0abf6523292213f9b810e5428d89069f08048f42 | |
| parent | 9ec61f8c4a60efc4ffb0364da124a774a1553f4e (diff) | |
| download | kernel-common-0da608d5f9df9385c2afbb7534d39e557328f6da.tar.gz kernel-common-0da608d5f9df9385c2afbb7534d39e557328f6da.tar.bz2 kernel-common-0da608d5f9df9385c2afbb7534d39e557328f6da.zip | |
Btrfs: set right total device count for seeding support
commit 298658414a2f0bea1f05a81876a45c1cd96aa2e0 upstream.
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | fs/btrfs/volumes.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c index 426968f95616..4e42358bd162 100644 --- a/fs/btrfs/volumes.c +++ b/fs/btrfs/volumes.c @@ -1889,7 +1889,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); |