1 files changed, 8 insertions, 4 deletions

diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c
index 6de2e1edd492..0b65eb51e562 100644
--- a/drivers/md/raid5.c
+++ b/drivers/md/raid5.c
@@ -4235,7 +4235,8 @@ static int clear_batch_ready(struct stripe_head *sh)
         return 0;
 }
 
-static void break_stripe_batch_list(struct stripe_head *head_sh)
+static void break_stripe_batch_list(struct stripe_head *head_sh,
+                                    unsigned long handle_flags)
 {
         struct stripe_head *sh, *next;
         int i;
@@ -4261,8 +4262,9 @@ static void break_stripe_batch_list(struct stripe_head *head_sh)
                 spin_lock_irq(&sh->stripe_lock);
                 sh->batch_head = NULL;
                 spin_unlock_irq(&sh->stripe_lock);
-
-                set_bit(STRIPE_HANDLE, &sh->state);
+                if (handle_flags == 0 ||
+                    sh->state & handle_flags)
+                        set_bit(STRIPE_HANDLE, &sh->state);
                 release_stripe(sh);
         }
         spin_lock_irq(&head_sh->stripe_lock);
@@ -4271,6 +4273,8 @@ static void break_stripe_batch_list(struct stripe_head *head_sh)
         for (i = 0; i < head_sh->disks; i++)
                 if (test_and_clear_bit(R5_Overlap, &head_sh->dev[i].flags))
                         do_wakeup = 1;
+        if (head_sh->state & handle_flags)
+                set_bit(STRIPE_HANDLE, &head_sh->state);
 
         if (do_wakeup)
                 wake_up(&head_sh->raid_conf->wait_for_overlap);
@@ -4299,7 +4303,7 @@ static void handle_stripe(struct stripe_head *sh)
         }
 
         if (test_and_clear_bit(STRIPE_BATCH_ERR, &sh->state))
-                break_stripe_batch_list(sh);
+                break_stripe_batch_list(sh, 0);
 
         if (test_bit(STRIPE_SYNC_REQUESTED, &sh->state) && !sh->batch_head) {
                 spin_lock(&sh->stripe_lock);