diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-05-02 12:22:51 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-05-02 12:22:51 -0700 |
| commit | 98bcf28636ac2397489e230b107a051524b1233b (patch) | |
| tree | 9e5e19a1d4fcff9a8824f029da3923e1ef532bf9 /drivers/md/md.c | |
| parent | 33656a1f2ee5346c742d63ddd0e0970c95a56b70 (diff) | |
| parent | b8a0b8e94648179b92191e5cf4fd3c4379b31cc4 (diff) | |
| download | op-kernel-dev-98bcf28636ac2397489e230b107a051524b1233b.zip op-kernel-dev-98bcf28636ac2397489e230b107a051524b1233b.tar.gz | |
Merge tag 'md/4.6-rc6-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/shli/md
Pull MD fixes from Shaohua Li:
"This update includes several trival fixes. The only important one is
to fix MD bio merge, which has big performance impact"
* tag 'md/4.6-rc6-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/shli/md:
raid5: delete unnecessary warnning
MD: make bio mergeable
md/raid0: remove empty line printk from dump_zones
md/raid0: fix uninitialized variable bug
Diffstat (limited to 'drivers/md/md.c')
| -rw-r--r-- | drivers/md/md.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/md/md.c b/drivers/md/md.c index 194580f..14d3b37 100644 --- a/drivers/md/md.c +++ b/drivers/md/md.c @@ -284,6 +284,8 @@ static blk_qc_t md_make_request(struct request_queue *q, struct bio *bio) * go away inside make_request */ sectors = bio_sectors(bio); + /* bio could be mergeable after passing to underlayer */ + bio->bi_rw &= ~REQ_NOMERGE; mddev->pers->make_request(mddev, bio); cpu = part_stat_lock(); |
