Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e59aa23f authored by majianpeng's avatar majianpeng Committed by NeilBrown
Browse files

md/raid5: For stripe with R5_ReadNoMerge, we replace REQ_FLUSH with REQ_NOMERGE. 



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: default avatarJianpeng Ma <majianpeng@gmail.com>
Signed-off-by: default avatarNeilBrown <neilb@suse.de>
parent c0f8bd14

drivers/md/raid5.c

+1 −1
Original line number Diff line number Diff line
@@ -874,7 +874,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;