From fe3f84474f303baf3b52d901d0c64c5bf5504c4e Mon Sep 17 00:00:00 2001 From: Neil Brown Date: Mon, 5 Nov 2007 14:51:02 -0800 Subject: [PATCH] --- yaml --- r: 73207 b: refs/heads/master c: def6ae26a9e69c3e6d0f0054524c76fd32420ecd h: refs/heads/master i: 73205: 40bb669079dc21d9c39fdc6fe019728b297549b6 73203: 4c11ee88fa53b177bd4addfa32a1dcdbdb7c93af 73199: d2e9eeb2c88f72dfcb0bbe2a6f12ace0fab98402 v: v3 --- [refs] | 2 +- trunk/drivers/md/raid5.c | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index b42ac2aab6d2..149e91da418c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 139b82984af5a98e4b03fd01616d79fc4970128a +refs/heads/master: def6ae26a9e69c3e6d0f0054524c76fd32420ecd diff --git a/trunk/drivers/md/raid5.c b/trunk/drivers/md/raid5.c index 80a67d789b72..82af3465a900 100644 --- a/trunk/drivers/md/raid5.c +++ b/trunk/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;