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: Anand Jain <anand.jain@oracle.com>
[ whitespace adjustments ]
Signed-off-by: David Sterba <dsterba@suse.com>

diff --git a/fs/btrfs/dev-replace.c b/fs/btrfs/dev-replace.c
index d2c820c6f91e4e8b47a15d560ef48861d51573c7..7efbc4d1128b222f0d18c18998b0f955debc2ac9 100644 (file)
--- a/fs/btrfs/dev-replace.c
+++ b/fs/btrfs/dev-replace.c
@@ -172,7 +172,8 @@ no_valid_dev_replace_entry_found:
                                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));

diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c
index 53cb2a1d025f3441a9e9e79fa6f314e3a8392f77..8d51e4bb67c1585f0d9272dd90518b7987b8f52b 100644 (file)
--- a/fs/btrfs/extent-tree.c
+++ b/fs/btrfs/extent-tree.c
@@ -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)

diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c
index 8c75e555e3f84f5b11825cb9095dfa42c6f8e250..a1fd5f7f829859636207156ed58d5092a83b6165 100644 (file)
--- a/fs/btrfs/ioctl.c
+++ b/fs/btrfs/ioctl.c
@@ -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;
        }

diff --git a/fs/btrfs/scrub.c b/fs/btrfs/scrub.c
index f8a073ce490bbe449260434cb00d72da6a5b8f37..03da807c43cf54670590bb74cc9db18de20af0fc 100644 (file)
--- a/fs/btrfs/scrub.c
+++ b/fs/btrfs/scrub.c
@@ -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;

diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c
index ba5324523995d42182b05312605d2e352b356785..84707e77c051d8e71d86b88f21f20fb0bc14f31f 100644 (file)
--- a/fs/btrfs/super.c
+++ b/fs/btrfs/super.c
@@ -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)

diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c
index a102e77b35b0ac6bff05ba95095851fe968d4562..3690822d469a8410e50c31742fac9258c9d0618d 100644 (file)
--- a/fs/btrfs/volumes.c
+++ b/fs/btrfs/volumes.c
@@ -911,9 +911,10 @@ again:
        list_for_each_entry_safe(device, next, &fs_devices->devices, dev_list) {
                if (test_bit(BTRFS_DEV_STATE_IN_FS_METADATA,
                                                        &device->dev_state)) {
-                       if (!device->is_tgtdev_for_dev_replace &&
-                           (!latest_dev ||
-                            device->generation > latest_dev->generation)) {
+                       if (!test_bit(BTRFS_DEV_STATE_REPLACE_TGT,
+                            &device->dev_state) &&
+                            (!latest_dev ||
+                             device->generation > latest_dev->generation)) {
                                latest_dev = device;
                        }
                        continue;
@@ -930,7 +931,8 @@ again:
                         * not, which means whether this device is
                         * used or whether it should be removed.
                         */
-                       if (step == 0 || device->is_tgtdev_for_dev_replace) {
+                       if (step == 0 || test_bit(BTRFS_DEV_STATE_REPLACE_TGT,
+                                                 &device->dev_state)) {
                                continue;
                        }
                }
@@ -942,7 +944,8 @@ again:
                if (test_bit(BTRFS_DEV_STATE_WRITEABLE, &device->dev_state)) {
                        list_del_init(&device->dev_alloc_list);
                        clear_bit(BTRFS_DEV_STATE_WRITEABLE, &device->dev_state);
-                       if (!device->is_tgtdev_for_dev_replace)
+                       if (!test_bit(BTRFS_DEV_STATE_REPLACE_TGT,
+                                     &device->dev_state))
                                fs_devices->rw_devices--;
                }
                list_del_init(&device->dev_list);
@@ -1250,7 +1253,8 @@ int btrfs_account_dev_extents_size(struct btrfs_device *device, u64 start,
 
        *length = 0;
 
-       if (start >= device->total_bytes || device->is_tgtdev_for_dev_replace)
+       if (start >= device->total_bytes ||
+               test_bit(BTRFS_DEV_STATE_REPLACE_TGT, &device->dev_state))
                return 0;
 
        path = btrfs_alloc_path();
@@ -1428,7 +1432,8 @@ int find_free_dev_extent_start(struct btrfs_transaction *transaction,
        max_hole_size = 0;
 
 again:
-       if (search_start >= search_end || device->is_tgtdev_for_dev_replace) {
+       if (search_start >= search_end ||
+               test_bit(BTRFS_DEV_STATE_REPLACE_TGT, &device->dev_state)) {
                ret = -ENOSPC;
                goto out;
        }
@@ -1636,7 +1641,7 @@ static int btrfs_alloc_dev_extent(struct btrfs_trans_handle *trans,
        struct btrfs_key key;
 
        WARN_ON(!test_bit(BTRFS_DEV_STATE_IN_FS_METADATA, &device->dev_state));
-       WARN_ON(device->is_tgtdev_for_dev_replace);
+       WARN_ON(test_bit(BTRFS_DEV_STATE_REPLACE_TGT, &device->dev_state));
        path = btrfs_alloc_path();
        if (!path)
                return -ENOMEM;
@@ -1944,7 +1949,7 @@ int btrfs_rm_device(struct btrfs_fs_info *fs_info, const char *device_path,
        if (ret)
                goto out;
 
-       if (device->is_tgtdev_for_dev_replace) {
+       if (test_bit(BTRFS_DEV_STATE_REPLACE_TGT, &device->dev_state)) {
                ret = BTRFS_ERROR_DEV_TGT_REPLACE;
                goto out;
        }
@@ -2451,7 +2456,7 @@ int btrfs_init_new_device(struct btrfs_fs_info *fs_info, const char *device_path
        device->fs_info = fs_info;
        device->bdev = bdev;
        set_bit(BTRFS_DEV_STATE_IN_FS_METADATA, &device->dev_state);
-       device->is_tgtdev_for_dev_replace = 0;
+       clear_bit(BTRFS_DEV_STATE_REPLACE_TGT, &device->dev_state);
        device->mode = FMODE_EXCL;
        device->dev_stats_valid = 1;
        set_blocksize(device->bdev, BTRFS_BDEV_BLOCKSIZE);
@@ -2660,7 +2665,7 @@ int btrfs_init_dev_replace_tgtdev(struct btrfs_fs_info *fs_info,
        device->fs_info = fs_info;
        device->bdev = bdev;
        set_bit(BTRFS_DEV_STATE_IN_FS_METADATA, &device->dev_state);
-       device->is_tgtdev_for_dev_replace = 1;
+       set_bit(BTRFS_DEV_STATE_REPLACE_TGT, &device->dev_state);
        device->mode = FMODE_EXCL;
        device->dev_stats_valid = 1;
        set_blocksize(device->bdev, BTRFS_BDEV_BLOCKSIZE);
@@ -2756,7 +2761,7 @@ int btrfs_grow_device(struct btrfs_trans_handle *trans,
        diff = round_down(new_size - device->total_bytes, fs_info->sectorsize);
 
        if (new_size <= device->total_bytes ||
-           device->is_tgtdev_for_dev_replace) {
+           test_bit(BTRFS_DEV_STATE_REPLACE_TGT, &device->dev_state)) {
                mutex_unlock(&fs_info->chunk_mutex);
                return -EINVAL;
        }
@@ -3569,7 +3574,7 @@ static int __btrfs_balance(struct btrfs_fs_info *fs_info)
                if (!test_bit(BTRFS_DEV_STATE_WRITEABLE, &device->dev_state) ||
                    btrfs_device_get_total_bytes(device) -
                    btrfs_device_get_bytes_used(device) > size_to_free ||
-                   device->is_tgtdev_for_dev_replace)
+                   test_bit(BTRFS_DEV_STATE_REPLACE_TGT, &device->dev_state))
                        continue;
 
                ret = btrfs_shrink_device(device, old_size - size_to_free);
@@ -4437,7 +4442,7 @@ int btrfs_shrink_device(struct btrfs_device *device, u64 new_size)
        new_size = round_down(new_size, fs_info->sectorsize);
        diff = round_down(old_size - new_size, fs_info->sectorsize);
 
-       if (device->is_tgtdev_for_dev_replace)
+       if (test_bit(BTRFS_DEV_STATE_REPLACE_TGT, &device->dev_state))
                return -EINVAL;
 
        path = btrfs_alloc_path();
@@ -4742,7 +4747,7 @@ static int __btrfs_alloc_chunk(struct btrfs_trans_handle *trans,
 
                if (!test_bit(BTRFS_DEV_STATE_IN_FS_METADATA,
                                        &device->dev_state) ||
-                    device->is_tgtdev_for_dev_replace)
+                   test_bit(BTRFS_DEV_STATE_REPLACE_TGT, &device->dev_state))
                        continue;
 
                if (device->total_bytes > device->bytes_used)
@@ -6566,7 +6571,7 @@ static void fill_device_from_item(struct extent_buffer *leaf,
        device->io_width = btrfs_device_io_width(leaf, dev_item);
        device->sector_size = btrfs_device_sector_size(leaf, dev_item);
        WARN_ON(device->devid == BTRFS_DEV_REPLACE_DEVID);
-       device->is_tgtdev_for_dev_replace = 0;
+       clear_bit(BTRFS_DEV_STATE_REPLACE_TGT, &device->dev_state);
 
        ptr = btrfs_device_uuid(dev_item);
        read_extent_buffer(leaf, device->uuid, ptr, BTRFS_UUID_SIZE);
@@ -6716,7 +6721,7 @@ static int read_one_dev(struct btrfs_fs_info *fs_info,
        fill_device_from_item(leaf, dev_item, device);
        set_bit(BTRFS_DEV_STATE_IN_FS_METADATA, &device->dev_state);
        if (test_bit(BTRFS_DEV_STATE_WRITEABLE, &device->dev_state) &&
-           !device->is_tgtdev_for_dev_replace) {
+          !test_bit(BTRFS_DEV_STATE_REPLACE_TGT, &device->dev_state)) {
                device->fs_devices->total_rw_bytes += device->total_bytes;
                atomic64_add(device->total_bytes - device->bytes_used,
                                &fs_info->free_chunk_space);

diff --git a/fs/btrfs/volumes.h b/fs/btrfs/volumes.h
index 68affb06502a0c166ba67e2fe105a73a02c83dfb..2ac123154c8d140cf23fd3e1ff19927b289a7ba8 100644 (file)
--- a/fs/btrfs/volumes.h
+++ b/fs/btrfs/volumes.h
@@ -50,6 +50,7 @@ struct btrfs_pending_bios {
 #define BTRFS_DEV_STATE_WRITEABLE      (0)
 #define BTRFS_DEV_STATE_IN_FS_METADATA (1)
 #define BTRFS_DEV_STATE_MISSING                (2)
+#define BTRFS_DEV_STATE_REPLACE_TGT    (3)
 
 struct btrfs_device {
        struct list_head dev_list;
@@ -74,7 +75,6 @@ struct btrfs_device {
        fmode_t mode;
 
        unsigned long dev_state;
-       int is_tgtdev_for_dev_replace;
        blk_status_t last_flush_error;
        int flush_bio_sent;