tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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 <neilb@suse.de>
Cc: "Dan Williams" <dan.j.williams@intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

authored by

Neil Brown and committed by
Linus Torvalds def6ae26 139b8298

+7 -7
+7 -7
drivers/md/raid5.c
··· 2624 2624 s.expanded = test_bit(STRIPE_EXPAND_READY, &sh->state); 2625 2625 /* Now to look around and see what can be done */ 2626 2626 2627 + /* clean-up completed biofill operations */ 2628 + if (test_bit(STRIPE_OP_BIOFILL, &sh->ops.complete)) { 2629 + clear_bit(STRIPE_OP_BIOFILL, &sh->ops.pending); 2630 + clear_bit(STRIPE_OP_BIOFILL, &sh->ops.ack); 2631 + clear_bit(STRIPE_OP_BIOFILL, &sh->ops.complete); 2632 + } 2633 + 2627 2634 rcu_read_lock(); 2628 2635 for (i=disks; i--; ) { 2629 2636 mdk_rdev_t *rdev; ··· 2903 2896 s.expanding = test_bit(STRIPE_EXPAND_SOURCE, &sh->state); 2904 2897 s.expanded = test_bit(STRIPE_EXPAND_READY, &sh->state); 2905 2898 /* Now to look around and see what can be done */ 2906 - 2907 - /* clean-up completed biofill operations */ 2908 - if (test_bit(STRIPE_OP_BIOFILL, &sh->ops.complete)) { 2909 - clear_bit(STRIPE_OP_BIOFILL, &sh->ops.pending); 2910 - clear_bit(STRIPE_OP_BIOFILL, &sh->ops.ack); 2911 - clear_bit(STRIPE_OP_BIOFILL, &sh->ops.complete); 2912 - } 2913 2899 2914 2900 rcu_read_lock(); 2915 2901 for (i=disks; i--; ) {