UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Heinz Mauelshagen 2017-12-02 01:03:56 +01:00 committed by Mike Snitzer
parent 4102d9de6d
commit 78a75d10ef
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/md/dm-raid.c
View File

@ -227,7 +227,6 @@ struct rs_layout {
struct raid_set { struct raid_set {
struct dm_target *ti; struct dm_target *ti;
uint32_t bitmap_loaded;
uint32_t stripe_cache_entries; uint32_t stripe_cache_entries;
unsigned long ctr_flags; unsigned long ctr_flags;
unsigned long runtime_flags; unsigned long runtime_flags;
@ -3964,9 +3963,6 @@ static void raid_resume(struct dm_target *ti)
attempt_restore_of_faulty_devices(rs); attempt_restore_of_faulty_devices(rs);
} }
mddev->ro = 0;
mddev->in_sync = 0;
/* Only reduce raid set size before running a disk removing reshape. */ /* Only reduce raid set size before running a disk removing reshape. */
if (mddev->delta_disks < 0) if (mddev->delta_disks < 0)
rs_set_capacity(rs); 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)) { if (test_and_clear_bit(RT_FLAG_RS_SUSPENDED, &rs->runtime_flags)) {
mddev_lock_nointr(mddev); mddev_lock_nointr(mddev);
mddev->ro = 0;
mddev->in_sync = 0;
mddev_resume(mddev); mddev_resume(mddev);
mddev_unlock(mddev); mddev_unlock(mddev);
} }