raid5 patch apply fix

diff --git a/queue-2.6.23/md-raid5-fix-clearing-of-biofill-operations.patch b/queue-2.6.23/md-raid5-not-raid6-fix-clearing-of-biofill-operations.patch
similarity index 89%
rename from queue-2.6.23/md-raid5-fix-clearing-of-biofill-operations.patch
rename to queue-2.6.23/md-raid5-not-raid6-fix-clearing-of-biofill-operations.patch
index 0bcb069e53751973446044739062f33bb1c5c1f5..e7f7bc607797484e2624baf47d210a38aea68e9c 100644 (file)
--- a/queue-2.6.23/md-raid5-fix-clearing-of-biofill-operations.patch
+++ b/queue-2.6.23/md-raid5-not-raid6-fix-clearing-of-biofill-operations.patch
@@ -6,9 +6,12 @@ To: torvalds@linux-foundation.org
 Cc: joel.bertrand@systella.fr, neilb@suse.de, akpm@linux-foundation.org, dan.j.williams@intel.com, stable@kernel.org
 Message-ID: <200710230345.l9N3jC2M030292@imap1.linux-foundation.org>
 
+raid5: fix clearing of biofill operations
+
 From: Dan Williams <dan.j.williams@intel.com>
 
-patch 4ae3f847e49e3787eca91bced31f8fd328d50496 in mainline.
+This is the correct merge of the two upstream patches for this issue (it
+was mis-merged...)
 
 ops_complete_biofill() runs outside of spin_lock(&sh->lock) and clears the
 'pending' and 'ack' bits.  Since the test_and_ack_op() macro only checks
@@ -19,8 +22,6 @@ Move the clearing of these bits to handle_stripe5(), under the lock.
 Signed-off-by: Dan Williams <dan.j.williams@intel.com>
 Tested-by: Joel Bertrand <joel.bertrand@systella.fr>
 Signed-off-by: Neil Brown <neilb@suse.de>
-Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
-Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
 Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 
 ---
@@ -53,7 +54,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  
        return_io(return_bi);
  
-@@ -2903,6 +2907,13 @@ static void handle_stripe6(struct stripe
+@@ -2630,6 +2634,13 @@ static void handle_stripe5(struct stripe
        s.expanded = test_bit(STRIPE_EXPAND_READY, &sh->state);
        /* Now to look around and see what can be done */
  

diff --git a/queue-2.6.23/series b/queue-2.6.23/series
index 844bf80e51646d3827a11916e8ba573ed241d849..822015bfeb13bcfee117e05634648ac4a2219795 100644 (file)
--- a/queue-2.6.23/series
+++ b/queue-2.6.23/series
@@ -55,7 +55,7 @@ ide-fix-cs5535-driver-accessing-beyond-array-boundary.patch
 tg3-fix-performance-regression-on-5705.patch
 nfs-fix-a-writeback-race.patch
 md-fix-an-unsigned-compare-to-allow-creation-of-bitmaps-with-v1.0-metadata.patch
-md-raid5-fix-clearing-of-biofill-operations.patch
+md-raid5-not-raid6-fix-clearing-of-biofill-operations.patch
 char-rocket-fix-dynamic_dev-tty.patch
 char-moxa-fix-and-optimise-empty-timer.patch
 usb-add-urb_free_buffer-to-permissible-flags.patch