md: separate flags for superblock changes

The mddev->flags are used for different purposes. There are a lot of
places we check/change the flags without masking unrelated flags, we
could check/change unrelated flags. These usage are most for superblock
write, so spearate superblock related flags. This should make the code
clearer and also fix real bugs.

Reviewed-by: NeilBrown <neilb@suse.com>
Signed-off-by: Shaohua Li <shli@fb.com>

1 files changed, 6 insertions, 6 deletions

diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c
index efc2e744cfd3..a1f3fbed9100 100644
--- a/drivers/md/raid1.c
+++ b/drivers/md/raid1.c
@@ -1517,8 +1517,8 @@ static void raid1_error(struct mddev *mddev, struct md_rdev *rdev)
          * if recovery is running, make sure it aborts.
          */
         set_bit(MD_RECOVERY_INTR, &mddev->recovery);
-        set_mask_bits(&mddev->flags, 0,
-                      BIT(MD_CHANGE_DEVS) | BIT(MD_CHANGE_PENDING));
+        set_mask_bits(&mddev->sb_flags, 0,
+                      BIT(MD_SB_CHANGE_DEVS) | BIT(MD_SB_CHANGE_PENDING));
         pr_crit("md/raid1:%s: Disk failure on %s, disabling device.\n"
                 "md/raid1:%s: Operation continuing on %d devices.\n",
                 mdname(mddev), bdevname(rdev->bdev, b),
@@ -2464,10 +2464,10 @@ static void raid1d(struct md_thread *thread)
         md_check_recovery(mddev);
 
         if (!list_empty_careful(&conf->bio_end_io_list) &&
-            !test_bit(MD_CHANGE_PENDING, &mddev->flags)) {
+            !test_bit(MD_SB_CHANGE_PENDING, &mddev->sb_flags)) {
                 LIST_HEAD(tmp);
                 spin_lock_irqsave(&conf->device_lock, flags);
-                if (!test_bit(MD_CHANGE_PENDING, &mddev->flags)) {
+                if (!test_bit(MD_SB_CHANGE_PENDING, &mddev->sb_flags)) {
                         while (!list_empty(&conf->bio_end_io_list)) {
                                 list_move(conf->bio_end_io_list.prev, &tmp);
                                 conf->nr_queued--;
@@ -2521,7 +2521,7 @@ static void raid1d(struct md_thread *thread)
                         generic_make_request(r1_bio->bios[r1_bio->read_disk]);
 
                 cond_resched();
-                if (mddev->flags & ~(1<<MD_CHANGE_PENDING))
+                if (mddev->sb_flags & ~(1<<MD_SB_CHANGE_PENDING))
                         md_check_recovery(mddev);
         }
         blk_finish_plug(&plug);
@@ -2724,7 +2724,7 @@ static sector_t raid1_sync_request(struct mddev *mddev, sector_t sector_nr,
                                                         min_bad, 0
                                         ) && ok;
                         }
-                set_bit(MD_CHANGE_DEVS, &mddev->flags);
+                set_bit(MD_SB_CHANGE_DEVS, &mddev->sb_flags);
                 *skipped = 1;
                 put_buf(r1_bio);