Skip to content

Commit

Permalink
dm raid: small cleanup and remove unsed "struct raid_set" member
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Heinz Mauelshagen authored and Mike Snitzer committed Dec 8, 2017
1 parent 4102d9d commit 78a75d1
Showing 1 changed file with 2 additions and 4 deletions.
6 changes: 2 additions & 4 deletions drivers/md/dm-raid.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);
Expand All @@ -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);
}
Expand Down

0 comments on commit 78a75d1

Please sign in to comment.