Home Home > GIT Browse > vanilla
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKernel Build Daemon <kbuild@suse.de>2015-04-20 07:06:00 +0200
committerKernel Build Daemon <kbuild@suse.de>2015-04-20 07:06:00 +0200
commit2b880520014967f13227c77ae95d65158ff81d0d (patch)
treeefffd69d39046908344c5fce3685440e276048fc
parentb1933b297080c49514a2368cb774366803b99496 (diff)
parent95993f85f09fcffcbd3773249d2b352b39bca61d (diff)
Merge branch 'SLE11-SP3' into SLE11-SP4rpm-3.0.101-55
-rw-r--r--drivers/md/md.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/md/md.c b/drivers/md/md.c
index 68e751ea6697..cd23f2677544 100644
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@ -3308,7 +3308,7 @@ safe_delay_store(mddev_t *mddev, const char *cbuf, size_t len)
mddev->safemode_delay = (msec*HZ)/1000;
if (mddev->safemode_delay == 0)
mddev->safemode_delay = 1;
- if (mddev->safemode_delay < old_delay)
+ if (mddev->safemode_delay < old_delay || old_delay == 0)
md_safemode_timeout((unsigned long)mddev);
}
return len;