diff options
| author | NeilBrown <neilb@suse.de> | 2013-08-27 16:28:23 +1000 |
|---|---|---|
| committer | NeilBrown <neilb@suse.de> | 2013-08-27 16:28:23 +1000 |
| commit | 7a0a5355cbc71efa430c3730ffbd67ae04abfe31 (patch) | |
| tree | 3e45ce8d666145ead0b859f402aa6fbf1f73f567 /drivers/md/md.c | |
| parent | c9ad020fec895bf1e5fcc322d0ab9e67efd3e3a0 (diff) | |
| download | linux-7a0a5355cbc71efa430c3730ffbd67ae04abfe31.tar.bz2 | |
md: Don't test all of mddev->flags at once.
mddev->flags is mostly used to record if an update of the
metadata is needed. Sometimes the whole field is tested
instead of just the important bits. This makes it difficult
to introduce more state bits.
So replace all bare tests of mddev->flags with tests for the bits
that actually need testing.
Signed-off-by: NeilBrown <neilb@suse.de>
Diffstat (limited to 'drivers/md/md.c')
| -rw-r--r-- | drivers/md/md.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/md/md.c b/drivers/md/md.c index a2678d882151..084a6540a4bd 100644 --- a/drivers/md/md.c +++ b/drivers/md/md.c @@ -5144,7 +5144,7 @@ int md_run(struct mddev *mddev) set_bit(MD_RECOVERY_NEEDED, &mddev->recovery); - if (mddev->flags) + if (mddev->flags & MD_UPDATE_SB_FLAGS) md_update_sb(mddev, 0); md_new_event(mddev); @@ -5289,7 +5289,7 @@ static void __md_stop_writes(struct mddev *mddev) md_super_wait(mddev); if (mddev->ro == 0 && - (!mddev->in_sync || mddev->flags)) { + (!mddev->in_sync || (mddev->flags & MD_UPDATE_SB_FLAGS))) { /* mark array as shutdown cleanly */ mddev->in_sync = 1; md_update_sb(mddev, 1); @@ -7814,7 +7814,7 @@ void md_check_recovery(struct mddev *mddev) sysfs_notify_dirent_safe(mddev->sysfs_state); } - if (mddev->flags) + if (mddev->flags & MD_UPDATE_SB_FLAGS) md_update_sb(mddev, 0); if (test_bit(MD_RECOVERY_RUNNING, &mddev->recovery) && |