diff options
author | Anand Jain <anand.jain@oracle.com> | 2017-12-03 23:54:55 -0500 |
---|---|---|
committer | David Sterba <dsterba@suse.com> | 2018-01-22 10:08:15 -0500 |
commit | 401e29c124eac2b9373eb72f36f202561da339d2 (patch) | |
tree | eb32408cafe3f1f2b5f24a8f2a5e2e6d23150d9e /fs/btrfs/dev-replace.c | |
parent | e6e674bd4d54fe8d47a06914f3b90752785b4882 (diff) |
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>
Diffstat (limited to 'fs/btrfs/dev-replace.c')
-rw-r--r-- | fs/btrfs/dev-replace.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/fs/btrfs/dev-replace.c b/fs/btrfs/dev-replace.c index d2c820c6f91e..7efbc4d1128b 100644 --- a/fs/btrfs/dev-replace.c +++ b/fs/btrfs/dev-replace.c | |||
@@ -172,7 +172,8 @@ no_valid_dev_replace_entry_found: | |||
172 | dev_replace->tgtdev->commit_bytes_used = | 172 | dev_replace->tgtdev->commit_bytes_used = |
173 | dev_replace->srcdev->commit_bytes_used; | 173 | dev_replace->srcdev->commit_bytes_used; |
174 | } | 174 | } |
175 | dev_replace->tgtdev->is_tgtdev_for_dev_replace = 1; | 175 | set_bit(BTRFS_DEV_STATE_REPLACE_TGT, |
176 | &dev_replace->tgtdev->dev_state); | ||
176 | btrfs_init_dev_replace_tgtdev_for_resume(fs_info, | 177 | btrfs_init_dev_replace_tgtdev_for_resume(fs_info, |
177 | dev_replace->tgtdev); | 178 | dev_replace->tgtdev); |
178 | } | 179 | } |
@@ -566,7 +567,7 @@ static int btrfs_dev_replace_finishing(struct btrfs_fs_info *fs_info, | |||
566 | btrfs_dev_name(src_device), | 567 | btrfs_dev_name(src_device), |
567 | src_device->devid, | 568 | src_device->devid, |
568 | rcu_str_deref(tgt_device->name)); | 569 | rcu_str_deref(tgt_device->name)); |
569 | tgt_device->is_tgtdev_for_dev_replace = 0; | 570 | clear_bit(BTRFS_DEV_STATE_REPLACE_TGT, &tgt_device->dev_state); |
570 | tgt_device->devid = src_device->devid; | 571 | tgt_device->devid = src_device->devid; |
571 | src_device->devid = BTRFS_DEV_REPLACE_DEVID; | 572 | src_device->devid = BTRFS_DEV_REPLACE_DEVID; |
572 | memcpy(uuid_tmp, tgt_device->uuid, sizeof(uuid_tmp)); | 573 | memcpy(uuid_tmp, tgt_device->uuid, sizeof(uuid_tmp)); |