On Thu, Oct 31 2013, NeilBrown wrote: > On Wed, 30 Oct 2013 10:41:46 +0800 majianpeng <majianpeng@xxxxxxxxx> wrote: > > > For R5_ReadNoMerge,it mean this bio can't merge with other bios or > > request.It used REQ_FLUSH to achieve this. But REQ_NOMERGE can do the > > same work. > > > > Signed-off-by: Jianpeng Ma <majianpeng@xxxxxxxxx> > > --- > > drivers/md/raid5.c | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c > > index f8b9068..8e0aeaa 100644 > > --- a/drivers/md/raid5.c > > +++ b/drivers/md/raid5.c > > @@ -772,7 +772,7 @@ static void ops_run_io(struct stripe_head *sh, struct stripe_head_state *s) > > bi->bi_sector = (sh->sector > > + rdev->data_offset); > > if (test_bit(R5_ReadNoMerge, &sh->dev[i].flags)) > > - bi->bi_rw |= REQ_FLUSH; > > + bi->bi_rw |= REQ_NOMERGE; > > > > bi->bi_vcnt = 1; > > bi->bi_io_vec[0].bv_len = STRIPE_SIZE; > > Thanks. > > I've queued this up pending Jens' acceptance of the other patches. I've queued up the other two for 3.13. -- Jens Axboe -- To unsubscribe from this list: send the line "unsubscribe linux-raid" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
