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

Commit 55e50e45 authored by Ilya Dryomov's avatar Ilya Dryomov Committed by Chris Mason
Browse files

Btrfs: do not add replace target to the alloc_list 



If replace was suspended by the umount, replace target device is added
to the fs_devices->alloc_list during a later mount.  This is obviously
wrong.  ->is_tgtdev_for_dev_replace is supposed to guard against that,
but ->is_tgtdev_for_dev_replace is (and can only ever be) initialized
*after* everything is opened and fs_devices lists are populated.  Fix
this by checking the devid instead: for replace targets it's always
equal to BTRFS_DEV_REPLACE_DEVID.

Cc: Stefan Behrens <sbehrens@giantdisaster.de>
Signed-off-by: default avatarIlya Dryomov <idryomov@gmail.com>
Reviewed-by: default avatarStefan Behrens <sbehrens@giantdisaster.de>
Signed-off-by: default avatarJosef Bacik <jbacik@fusionio.com>
Signed-off-by: default avatarChris Mason <chris.mason@fusionio.com>
parent 83d4cfd4

fs/btrfs/volumes.c

+2 −1
Original line number Diff line number Diff line
@@ -796,7 +796,8 @@ static int __btrfs_open_devices(struct btrfs_fs_devices *fs_devices, 
			fs_devices->rotating = 1;



		fs_devices->open_devices++;

		if (device->writeable && !device->is_tgtdev_for_dev_replace) {

		if (device->writeable &&

		    device->devid != BTRFS_DEV_REPLACE_DEVID) {

			fs_devices->rw_devices++;

			list_add(&device->dev_alloc_list,

				 &fs_devices->alloc_list);