>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. > >By the way, your patch file has a carriage return as well as a newline at the >end of each line. >"patch" can still handle them but "git am" doesn't like it. > >If you are able to send the patches as plain text with just a NEWLINE at the >end of each line, rather than base64 encodes with carriage returns, it would >help a little. > Sorroy for that, i'll pay attention to this. Thanks! Jianpeng Ma >Thanks, >NeilBrown >?韬{.n?????%??檩??w?{.n???{炳盯w???塄}?财??j:+v??????2??璀??摺?囤??z夸z罐?+?????w棹f