The patch titled md: ensure all blocks are uptodate or locked when syncing has been added to the -mm tree. Its filename is md-ensure-all-blocks-are-uptodate-or-locked-when-syncing.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: md: ensure all blocks are uptodate or locked when syncing From: Dan Williams <dan.j.williams@xxxxxxxxx> Remove the dubious attempt to prefer 'compute' over 'read'. Not only is it wrong given commit c337869d (md: do not compute parity unless it is on a failed drive), but it can trigger a BUG_ON in handle_parity_checks5(). Cc: <stable@xxxxxxxxxx> Signed-off-by: Dan Williams <dan.j.williams@xxxxxxxxx> Cc: Neil Brown <neilb@xxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/md/raid5.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff -puN drivers/md/raid5.c~md-ensure-all-blocks-are-uptodate-or-locked-when-syncing drivers/md/raid5.c --- a/drivers/md/raid5.c~md-ensure-all-blocks-are-uptodate-or-locked-when-syncing +++ a/drivers/md/raid5.c @@ -2017,12 +2017,7 @@ static int __handle_issuing_new_read_req */ s->uptodate++; return 0; /* uptodate + compute == disks */ - } else if ((s->uptodate < disks - 1) && - test_bit(R5_Insync, &dev->flags)) { - /* Note: we hold off compute operations while checks are - * in flight, but we still prefer 'compute' over 'read' - * hence we only read if (uptodate < * disks-1) - */ + } else if (test_bit(R5_Insync, &dev->flags)) { set_bit(R5_LOCKED, &dev->flags); set_bit(R5_Wantread, &dev->flags); if (!test_and_set_bit(STRIPE_OP_IO, &sh->ops.pending)) _ Patches currently in -mm which might be from dan.j.williams@xxxxxxxxx are md-ensure-all-blocks-are-uptodate-or-locked-when-syncing.patch linux-next.patch dma-fix-platform-driver-hotplug-coldplug.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html