[PATCH] md: fix rdev->pending counts in raid1
When we do a user-requested check/repair, we lose count of the outstanding requests... Also make sure that when anything is written to md/sync_action, the RECOVERY_NEEDED flag is set and the thread is woken up so any changes take effect. Signed-off-by: Neil Brown <neilb@suse.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
committed by
Linus Torvalds
parent
c708443c00
commit
03c902e17f
@@ -1826,13 +1826,10 @@ action_store(mddev_t *mddev, const char *page, size_t len)
|
||||
mddev->sync_thread = NULL;
|
||||
mddev->recovery = 0;
|
||||
}
|
||||
return len;
|
||||
}
|
||||
|
||||
if (test_bit(MD_RECOVERY_RUNNING, &mddev->recovery) ||
|
||||
test_bit(MD_RECOVERY_NEEDED, &mddev->recovery))
|
||||
} else if (test_bit(MD_RECOVERY_RUNNING, &mddev->recovery) ||
|
||||
test_bit(MD_RECOVERY_NEEDED, &mddev->recovery))
|
||||
return -EBUSY;
|
||||
if (cmd_match(page, "resync") || cmd_match(page, "recover"))
|
||||
else if (cmd_match(page, "resync") || cmd_match(page, "recover"))
|
||||
set_bit(MD_RECOVERY_NEEDED, &mddev->recovery);
|
||||
else {
|
||||
if (cmd_match(page, "check"))
|
||||
@@ -1841,8 +1838,8 @@ action_store(mddev_t *mddev, const char *page, size_t len)
|
||||
return -EINVAL;
|
||||
set_bit(MD_RECOVERY_REQUESTED, &mddev->recovery);
|
||||
set_bit(MD_RECOVERY_SYNC, &mddev->recovery);
|
||||
set_bit(MD_RECOVERY_NEEDED, &mddev->recovery);
|
||||
}
|
||||
set_bit(MD_RECOVERY_NEEDED, &mddev->recovery);
|
||||
md_wakeup_thread(mddev->thread);
|
||||
return len;
|
||||
}
|
||||
|
Reference in New Issue
Block a user