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

Commit 401e29c1 authored by Anand Jain's avatar Anand Jain Committed by David Sterba
Browse files

btrfs: cleanup device states define BTRFS_DEV_STATE_REPLACE_TGT 



Currently device state is being managed by each individual int
variable such as struct btrfs_device::is_tgtdev_for_dev_replace.
Instead of that declare btrfs_device::dev_state
BTRFS_DEV_STATE_MISSING and use the bit operations.

Signed-off-by: default avatarAnand Jain <anand.jain@oracle.com>
[ whitespace adjustments ]
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent e6e674bd

fs/btrfs/dev-replace.c

+3 −2
Original line number Diff line number Diff line
@@ -172,7 +172,8 @@ int btrfs_init_dev_replace(struct btrfs_fs_info *fs_info) 
				dev_replace->tgtdev->commit_bytes_used =

					dev_replace->srcdev->commit_bytes_used;

			}

			dev_replace->tgtdev->is_tgtdev_for_dev_replace = 1;

			set_bit(BTRFS_DEV_STATE_REPLACE_TGT,

				&dev_replace->tgtdev->dev_state);

			btrfs_init_dev_replace_tgtdev_for_resume(fs_info,

				dev_replace->tgtdev);

		}
@@ -566,7 +567,7 @@ static int btrfs_dev_replace_finishing(struct btrfs_fs_info *fs_info, 
			  btrfs_dev_name(src_device),

			  src_device->devid,

			  rcu_str_deref(tgt_device->name));

	tgt_device->is_tgtdev_for_dev_replace = 0;

	clear_bit(BTRFS_DEV_STATE_REPLACE_TGT, &tgt_device->dev_state);

	tgt_device->devid = src_device->devid;

	src_device->devid = BTRFS_DEV_REPLACE_DEVID;

	memcpy(uuid_tmp, tgt_device->uuid, sizeof(uuid_tmp));

fs/btrfs/extent-tree.c

+1 −1
Original line number Diff line number Diff line
@@ -9693,7 +9693,7 @@ int btrfs_can_relocate(struct btrfs_fs_info *fs_info, u64 bytenr) 
		 * space to fit our block group in.

		 */

		if (device->total_bytes > device->bytes_used + min_free &&

		    !device->is_tgtdev_for_dev_replace) {

		    !test_bit(BTRFS_DEV_STATE_REPLACE_TGT, &device->dev_state)) {

			ret = find_free_dev_extent(trans, device, min_free,

						   &dev_offset, NULL);

			if (!ret)

fs/btrfs/ioctl.c

+1 −1
Original line number Diff line number Diff line
@@ -1528,7 +1528,7 @@ static noinline int btrfs_ioctl_resize(struct file *file, 
		}

	}



	if (device->is_tgtdev_for_dev_replace) {

	if (test_bit(BTRFS_DEV_STATE_REPLACE_TGT, &device->dev_state)) {

		ret = -EPERM;

		goto out_free;

	}

fs/btrfs/scrub.c

+1 −1
Original line number Diff line number Diff line
@@ -4131,7 +4131,7 @@ int btrfs_scrub_dev(struct btrfs_fs_info *fs_info, u64 devid, u64 start, 


	mutex_lock(&fs_info->scrub_lock);

	if (!test_bit(BTRFS_DEV_STATE_IN_FS_METADATA, &dev->dev_state) ||

	    dev->is_tgtdev_for_dev_replace) {

	    test_bit(BTRFS_DEV_STATE_REPLACE_TGT, &dev->dev_state)) {

		mutex_unlock(&fs_info->scrub_lock);

		mutex_unlock(&fs_info->fs_devices->device_list_mutex);

		return -EIO;

fs/btrfs/super.c

+2 −1
Original line number Diff line number Diff line
@@ -1974,7 +1974,8 @@ static int btrfs_calc_avail_data_space(struct btrfs_fs_info *fs_info, 
	list_for_each_entry_rcu(device, &fs_devices->devices, dev_list) {

		if (!test_bit(BTRFS_DEV_STATE_IN_FS_METADATA,

						&device->dev_state) ||

		    !device->bdev || device->is_tgtdev_for_dev_replace)

		    !device->bdev ||

		    test_bit(BTRFS_DEV_STATE_REPLACE_TGT, &device->dev_state))

			continue;



		if (i >= nr_devices)