diff options
| author | Heinz Mauelshagen <heinzm@redhat.com> | 2017-12-02 01:03:56 +0100 |
|---|---|---|
| committer | Mike Snitzer <snitzer@redhat.com> | 2017-12-08 10:59:58 -0500 |
| commit | 78a75d10ef869f4fae70f9b86afce28eb1922529 (patch) | |
| tree | 4971326eb12caefeefe22f46f1996644e53694d5 /drivers/md/dm-raid.c | |
| parent | 4102d9de6d375fc27ec70382c4068f4f9f62ce4f (diff) | |
dm raid: small cleanup and remove unsed "struct raid_set" member
Move raid_resume()'s setting of 'rw' and 'in_sync' to just prior to
mddev_resume().
Also, remove unused 'bitmap_loaded' member from "struct raid_set".
No functional changes.
Signed-off-by: Heinz Mauelshagen <heinzm@redhat.com>
Signed-off-by: Mike Snitzer <snitzer@redhat.com>
Diffstat (limited to 'drivers/md/dm-raid.c')
| -rw-r--r-- | drivers/md/dm-raid.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/md/dm-raid.c b/drivers/md/dm-raid.c index 7e7075fb9c28..1069e617e727 100644 --- a/drivers/md/dm-raid.c +++ b/drivers/md/dm-raid.c @@ -227,7 +227,6 @@ struct rs_layout { struct raid_set { struct dm_target *ti; - uint32_t bitmap_loaded; uint32_t stripe_cache_entries; unsigned long ctr_flags; unsigned long runtime_flags; @@ -3964,9 +3963,6 @@ static void raid_resume(struct dm_target *ti) attempt_restore_of_faulty_devices(rs); } - mddev->ro = 0; - mddev->in_sync = 0; - /* Only reduce raid set size before running a disk removing reshape. */ if (mddev->delta_disks < 0) rs_set_capacity(rs); @@ -3989,6 +3985,8 @@ static void raid_resume(struct dm_target *ti) if (test_and_clear_bit(RT_FLAG_RS_SUSPENDED, &rs->runtime_flags)) { mddev_lock_nointr(mddev); + mddev->ro = 0; + mddev->in_sync = 0; mddev_resume(mddev); mddev_unlock(mddev); } |