Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=def6ae26a9e69c3e6d0f0054524c76fd32420ecd
Commit:     def6ae26a9e69c3e6d0f0054524c76fd32420ecd
Parent:     139b82984af5a98e4b03fd01616d79fc4970128a
Author:     Neil Brown <[EMAIL PROTECTED]>
AuthorDate: Mon Nov 5 14:51:02 2007 -0800
Committer:  Linus Torvalds <[EMAIL PROTECTED]>
CommitDate: Mon Nov 5 15:12:32 2007 -0800

    md: fix misapplied patch in raid5.c
    
    commit 4ae3f847e49e3787eca91bced31f8fd328d50496 ("md: raid5: fix
    clearing of biofill operations") did not get applied correctly,
    presumably due to substantial similarities between handle_stripe5 and
    handle_stripe6.
    
    This patch moves the chunk of new code from handle_stripe6 (where it isn't
    needed (yet)) to handle_stripe5.
    
    Signed-off-by: Neil Brown <[EMAIL PROTECTED]>
    Cc: "Dan Williams" <[EMAIL PROTECTED]>
    Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
    Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
---
 drivers/md/raid5.c |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c
index 80a67d7..82af346 100644
--- a/drivers/md/raid5.c
+++ b/drivers/md/raid5.c
@@ -2624,6 +2624,13 @@ static void handle_stripe5(struct stripe_head *sh)
        s.expanded = test_bit(STRIPE_EXPAND_READY, &sh->state);
        /* Now to look around and see what can be done */
 
+       /* clean-up completed biofill operations */
+       if (test_bit(STRIPE_OP_BIOFILL, &sh->ops.complete)) {
+               clear_bit(STRIPE_OP_BIOFILL, &sh->ops.pending);
+               clear_bit(STRIPE_OP_BIOFILL, &sh->ops.ack);
+               clear_bit(STRIPE_OP_BIOFILL, &sh->ops.complete);
+       }
+
        rcu_read_lock();
        for (i=disks; i--; ) {
                mdk_rdev_t *rdev;
@@ -2897,13 +2904,6 @@ static void handle_stripe6(struct stripe_head *sh, 
struct page *tmp_page)
        s.expanded = test_bit(STRIPE_EXPAND_READY, &sh->state);
        /* Now to look around and see what can be done */
 
-       /* clean-up completed biofill operations */
-       if (test_bit(STRIPE_OP_BIOFILL, &sh->ops.complete)) {
-               clear_bit(STRIPE_OP_BIOFILL, &sh->ops.pending);
-               clear_bit(STRIPE_OP_BIOFILL, &sh->ops.ack);
-               clear_bit(STRIPE_OP_BIOFILL, &sh->ops.complete);
-       }
-
        rcu_read_lock();
        for (i=disks; i--; ) {
                mdk_rdev_t *rdev;
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to