diff options
| author | majianpeng <majianpeng@gmail.com> | 2013-11-14 15:16:19 +1100 |
|---|---|---|
| committer | NeilBrown <neilb@suse.de> | 2013-11-19 15:19:18 +1100 |
| commit | e59aa23f4c0c61b4baa5d535a2071d6666e83502 (patch) | |
| tree | 954517a8875ef8bd9ffc1f3a3686d1f160dd12a1 /drivers/md/raid5.c | |
| parent | c0f8bd146a8b3e630798561c605f5669823107af (diff) | |
| download | linux-stable-e59aa23f4c0c61b4baa5d535a2071d6666e83502.tar.gz linux-stable-e59aa23f4c0c61b4baa5d535a2071d6666e83502.tar.bz2 linux-stable-e59aa23f4c0c61b4baa5d535a2071d6666e83502.zip | |
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: Jianpeng Ma <majianpeng@gmail.com>
Signed-off-by: NeilBrown <neilb@suse.de>
Diffstat (limited to 'drivers/md/raid5.c')
| -rw-r--r-- | drivers/md/raid5.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c index 02f6bc2ac2db..6c724fde5fd8 100644 --- a/drivers/md/raid5.c +++ b/drivers/md/raid5.c @@ -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; |