[kernel] r19274 - in dists/sid/linux/debian: . patches patches/bugfix/all

[Ben Hutchings]

Author: benh
Date: Sun Jul 22 16:28:43 2012
New Revision: 19274

Log:
raid5: delayed stripe fix (Closes: #680366)

Added:
   dists/sid/linux/debian/patches/bugfix/all/raid5-delayed-stripe-fix.patch
Modified:
   dists/sid/linux/debian/changelog
   dists/sid/linux/debian/patches/series

Modified: dists/sid/linux/debian/changelog
==============================================================================
--- dists/sid/linux/debian/changelog	Sun Jul 22 02:53:36 2012	(r19273)
+++ dists/sid/linux/debian/changelog	Sun Jul 22 16:28:43 2012	(r19274)
@@ -43,6 +43,7 @@
   * cipso: don't follow a NULL pointer when setsockopt() is called
   * [x86] hwmon: Enable SENSORS_SCH5636 as module (Closes: #680934)
   * atl1c: fix issue of transmit queue 0 timed out
+  * raid5: delayed stripe fix (Closes: #680366)
 
   [ Arnaud Patard ]
   * [mipsel] add r8169 to d-i udeb.

Added: dists/sid/linux/debian/patches/bugfix/all/raid5-delayed-stripe-fix.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/sid/linux/debian/patches/bugfix/all/raid5-delayed-stripe-fix.patch	Sun Jul 22 16:28:43 2012	(r19274)
@@ -0,0 +1,39 @@
+From: Shaohua Li <shli at kernel.org>
+Date: Tue, 3 Jul 2012 15:57:19 +1000
+Subject: raid5: delayed stripe fix
+
+commit fab363b5ff502d1b39ddcfec04271f5858d9f26e upstream.
+
+There isn't locking setting STRIPE_DELAYED and STRIPE_PREREAD_ACTIVE bits, but
+the two bits have relationship. A delayed stripe can be moved to hold list only
+when preread active stripe count is below IO_THRESHOLD. If a stripe has both
+the bits set, such stripe will be in delayed list and preread count not 0,
+which will make such stripe never leave delayed list.
+
+Signed-off-by: Shaohua Li <shli at fusionio.com>
+Signed-off-by: NeilBrown <neilb at suse.de>
+Signed-off-by: Ben Hutchings <ben at decadent.org.uk>
+---
+ drivers/md/raid5.c |    4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c
+index 51169ec..7245a9d 100644
+--- a/drivers/md/raid5.c
++++ b/drivers/md/raid5.c
+@@ -196,12 +196,14 @@ static void __release_stripe(struct r5conf *conf, struct stripe_head *sh)
+ 		BUG_ON(!list_empty(&sh->lru));
+ 		BUG_ON(atomic_read(&conf->active_stripes)==0);
+ 		if (test_bit(STRIPE_HANDLE, &sh->state)) {
+-			if (test_bit(STRIPE_DELAYED, &sh->state))
++			if (test_bit(STRIPE_DELAYED, &sh->state) &&
++			    !test_bit(STRIPE_PREREAD_ACTIVE, &sh->state))
+ 				list_add_tail(&sh->lru, &conf->delayed_list);
+ 			else if (test_bit(STRIPE_BIT_DELAY, &sh->state) &&
+ 				   sh->bm_seq - conf->seq_write > 0)
+ 				list_add_tail(&sh->lru, &conf->bitmap_list);
+ 			else {
++				clear_bit(STRIPE_DELAYED, &sh->state);
+ 				clear_bit(STRIPE_BIT_DELAY, &sh->state);
+ 				list_add_tail(&sh->lru, &conf->handle_list);
+ 			}

Modified: dists/sid/linux/debian/patches/series
==============================================================================
--- dists/sid/linux/debian/patches/series	Sun Jul 22 02:53:36 2012	(r19273)
+++ dists/sid/linux/debian/patches/series	Sun Jul 22 16:28:43 2012	(r19274)
@@ -383,3 +383,4 @@
 bugfix/x86/drm-i915-prefer-wide-slow-to-fast-narrow-in-DP-confi.patch
 bugfix/all/cipso-don-t-follow-a-NULL-pointer-when-setsockopt-is.patch
 bugfix/all/atl1c-fix-issue-of-transmit-queue-0-timed-out.patch
+bugfix/all/raid5-delayed-stripe-fix.patch