From: NeilBrown <neilb@cse.unsw.edu.au>
md_enter_safemode checks if it is time to mark the md superblock as 'clean'.
i.e. if all writes have completed and a suitable delay has passed.
This is currently called from md_handle_safemode which in-turn is called
(almost) every time md_check_recovery is called, and from the end of
md_do_sync which causes the mddev->thread to run, which will always call
md_check_recovery as well.
So it doesn't need to be a separate function and fits quite well into
md_check_recovery.
The "almost" is because multipathd calls md_check_recovery but not
md_handle_safemode. This is OK because the code from md_enter_safemode is a
no-op if mddev->safemode == 0, which it always is for a multipathd (providing
we don't allow it to be set to 2 on a signal...)
Signed-off-by: Neil Brown <neilb@cse.unsw.edu.au>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---
25-akpm/drivers/md/md.c | 58 ++++++++++++++++-------------------------
25-akpm/drivers/md/raid1.c | 1
25-akpm/drivers/md/raid10.c | 1
25-akpm/drivers/md/raid5.c | 1
25-akpm/drivers/md/raid6main.c | 1
5 files changed, 24 insertions(+), 38 deletions(-)
diff -puN drivers/md/md.c~md-merge-md_enter_safemode-into-md_check_recovery drivers/md/md.c
--- 25/drivers/md/md.c~md-merge-md_enter_safemode-into-md_check_recovery 2005-02-17 18:00:53.000000000 -0800
+++ 25-akpm/drivers/md/md.c 2005-02-17 18:00:53.000000000 -0800
@@ -3323,37 +3323,6 @@ void md_write_end(mddev_t *mddev)
}
}
-static inline void md_enter_safemode(mddev_t *mddev)
-{
- if (!mddev->safemode) return;
- if (mddev->safemode == 2 &&
- (atomic_read(&mddev->writes_pending) || mddev->in_sync ||
- mddev->recovery_cp != MaxSector))
- return; /* avoid the lock */
- mddev_lock_uninterruptible(mddev);
- if (mddev->safemode && !atomic_read(&mddev->writes_pending) &&
- !mddev->in_sync && mddev->recovery_cp == MaxSector) {
- mddev->in_sync = 1;
- md_update_sb(mddev);
- }
- mddev_unlock(mddev);
-
- if (mddev->safemode == 1)
- mddev->safemode = 0;
-}
-
-void md_handle_safemode(mddev_t *mddev)
-{
- if (signal_pending(current)) {
- printk(KERN_INFO "md: %s in immediate safe mode\n",
- mdname(mddev));
- mddev->safemode = 2;
- flush_signals(current);
- }
- md_enter_safemode(mddev);
-}
-
-
DECLARE_WAIT_QUEUE_HEAD(resync_wait);
#define SYNC_MARKS 10
@@ -3574,7 +3543,6 @@ static void md_do_sync(mddev_t *mddev)
mddev->recovery_cp = MaxSector;
}
- md_enter_safemode(mddev);
skip:
mddev->curr_resync = 0;
wake_up(&resync_wait);
@@ -3615,14 +3583,37 @@ void md_check_recovery(mddev_t *mddev)
if (mddev->ro)
return;
+
+ if (signal_pending(current)) {
+ if (mddev->pers->sync_request) {
+ printk(KERN_INFO "md: %s in immediate safe mode\n",
+ mdname(mddev));
+ mddev->safemode = 2;
+ }
+ flush_signals(current);
+ }
+
if ( ! (
mddev->sb_dirty ||
test_bit(MD_RECOVERY_NEEDED, &mddev->recovery) ||
- test_bit(MD_RECOVERY_DONE, &mddev->recovery)
+ test_bit(MD_RECOVERY_DONE, &mddev->recovery) ||
+ (mddev->safemode == 1) ||
+ (mddev->safemode == 2 && ! atomic_read(&mddev->writes_pending)
+ && !mddev->in_sync && mddev->recovery_cp == MaxSector)
))
return;
+
if (mddev_trylock(mddev)==0) {
int spares =0;
+
+ if (mddev->safemode && !atomic_read(&mddev->writes_pending) &&
+ !mddev->in_sync && mddev->recovery_cp == MaxSector) {
+ mddev->in_sync = 1;
+ mddev->sb_dirty = 1;
+ }
+ if (mddev->safemode == 1)
+ mddev->safemode = 0;
+
if (mddev->sb_dirty)
md_update_sb(mddev);
if (test_bit(MD_RECOVERY_RUNNING, &mddev->recovery) &&
@@ -3869,7 +3860,6 @@ EXPORT_SYMBOL(md_error);
EXPORT_SYMBOL(md_done_sync);
EXPORT_SYMBOL(md_write_start);
EXPORT_SYMBOL(md_write_end);
-EXPORT_SYMBOL(md_handle_safemode);
EXPORT_SYMBOL(md_register_thread);
EXPORT_SYMBOL(md_unregister_thread);
EXPORT_SYMBOL(md_wakeup_thread);
diff -puN drivers/md/raid10.c~md-merge-md_enter_safemode-into-md_check_recovery drivers/md/raid10.c
--- 25/drivers/md/raid10.c~md-merge-md_enter_safemode-into-md_check_recovery 2005-02-17 18:00:53.000000000 -0800
+++ 25-akpm/drivers/md/raid10.c 2005-02-17 18:00:53.000000000 -0800
@@ -1216,7 +1216,6 @@ static void raid10d(mddev_t *mddev)
mdk_rdev_t *rdev;
md_check_recovery(mddev);
- md_handle_safemode(mddev);
for (;;) {
char b[BDEVNAME_SIZE];
diff -puN drivers/md/raid1.c~md-merge-md_enter_safemode-into-md_check_recovery drivers/md/raid1.c
--- 25/drivers/md/raid1.c~md-merge-md_enter_safemode-into-md_check_recovery 2005-02-17 18:00:53.000000000 -0800
+++ 25-akpm/drivers/md/raid1.c 2005-02-17 18:00:53.000000000 -0800
@@ -931,7 +931,6 @@ static void raid1d(mddev_t *mddev)
mdk_rdev_t *rdev;
md_check_recovery(mddev);
- md_handle_safemode(mddev);
for (;;) {
char b[BDEVNAME_SIZE];
diff -puN drivers/md/raid5.c~md-merge-md_enter_safemode-into-md_check_recovery drivers/md/raid5.c
--- 25/drivers/md/raid5.c~md-merge-md_enter_safemode-into-md_check_recovery 2005-02-17 18:00:53.000000000 -0800
+++ 25-akpm/drivers/md/raid5.c 2005-02-17 18:00:53.000000000 -0800
@@ -1546,7 +1546,6 @@ static void raid5d (mddev_t *mddev)
PRINTK("+++ raid5d active\n");
md_check_recovery(mddev);
- md_handle_safemode(mddev);
handled = 0;
spin_lock_irq(&conf->device_lock);
diff -puN drivers/md/raid6main.c~md-merge-md_enter_safemode-into-md_check_recovery drivers/md/raid6main.c
--- 25/drivers/md/raid6main.c~md-merge-md_enter_safemode-into-md_check_recovery 2005-02-17 18:00:53.000000000 -0800
+++ 25-akpm/drivers/md/raid6main.c 2005-02-17 18:00:53.000000000 -0800
@@ -1705,7 +1705,6 @@ static void raid6d (mddev_t *mddev)
PRINTK("+++ raid6d active\n");
md_check_recovery(mddev);
- md_handle_safemode(mddev);
handled = 0;
spin_lock_irq(&conf->device_lock);
_