diff options
-rw-r--r-- | drivers/md/md.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/drivers/md/md.c b/drivers/md/md.c index 5a949166dac0..0f9bc9a02a1b 100644 --- a/drivers/md/md.c +++ b/drivers/md/md.c | |||
@@ -3242,11 +3242,13 @@ safe_delay_store(struct mddev *mddev, const char *cbuf, size_t len) | |||
3242 | mddev->safemode_delay = 0; | 3242 | mddev->safemode_delay = 0; |
3243 | else { | 3243 | else { |
3244 | unsigned long old_delay = mddev->safemode_delay; | 3244 | unsigned long old_delay = mddev->safemode_delay; |
3245 | mddev->safemode_delay = (msec*HZ)/1000; | 3245 | unsigned long new_delay = (msec*HZ)/1000; |
3246 | if (mddev->safemode_delay == 0) | 3246 | |
3247 | mddev->safemode_delay = 1; | 3247 | if (new_delay == 0) |
3248 | if (mddev->safemode_delay < old_delay || old_delay == 0) | 3248 | new_delay = 1; |
3249 | md_safemode_timeout((unsigned long)mddev); | 3249 | mddev->safemode_delay = new_delay; |
3250 | if (new_delay < old_delay || old_delay == 0) | ||
3251 | mod_timer(&mddev->safemode_timer, jiffies+1); | ||
3250 | } | 3252 | } |
3251 | return len; | 3253 | return len; |
3252 | } | 3254 | } |