Home Home > GIT Browse > openSUSE-15.0
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
commitc09be5675adb4de2e8201ef90151f0d02df12fb1 (patch)
treeecd3ddacf203a7cf2dc4b392d915db412a0acd70
parentce207a8a1d2c75844f0518cb4c1ee84eeea070d3 (diff)
parentea372ade4ad6c1dcdedb2ef454f91edad431ca90 (diff)
Merge branch 'SLE11-SP3' into SLE11-SP4rpm-3.0.101-55
-rw-r--r--patches.fixes/0001-md-fix-safe_mode-buglet.patch31
-rw-r--r--series.conf1
2 files changed, 32 insertions, 0 deletions
diff --git a/patches.fixes/0001-md-fix-safe_mode-buglet.patch b/patches.fixes/0001-md-fix-safe_mode-buglet.patch
new file mode 100644
index 0000000000..0f52aedbef
--- /dev/null
+++ b/patches.fixes/0001-md-fix-safe_mode-buglet.patch
@@ -0,0 +1,31 @@
+From: NeilBrown <neilb@suse.de>
+Date: Thu, 8 Aug 2013 09:20:32 +1000
+Subject: [PATCH] md: fix safe_mode buglet.
+Git-commit: 275c51c4e34ed776d40a99dd97c1deee50303b07
+Patch-mainline: v3.12
+References: bnc#926767
+
+Whe we set the safe_mode_timeout to a smaller value we trigger a timeout
+immediately - otherwise the small value might not be honoured.
+However if the previous timeout was 0 meaning "no timeout", we didn't.
+This would mean that no timeout happens until the next write completes,
+which could be a long time.
+
+Signed-off-by: NeilBrown <neilb@suse.de>
+Acked-by: NeilBrown <neilb@suse.de>
+
+---
+ drivers/md/md.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- linux-3.0-SLE11-SP3.orig/drivers/md/md.c
++++ linux-3.0-SLE11-SP3/drivers/md/md.c
+@@ -3308,7 +3308,7 @@ safe_delay_store(mddev_t *mddev, const c
+ 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;
diff --git a/series.conf b/series.conf
index 50baca78c1..4eca11580e 100644
--- a/series.conf
+++ b/series.conf
@@ -20162,6 +20162,7 @@
patches.fixes/0001-md-plug_cnt.fix
patches.fixes/0001-md-don-t-give-up-looking-for-spares-on-first-failure.patch
+ patches.fixes/0001-md-fix-safe_mode-buglet.patch
##########################################################
#