diff options
| author | Alex Shi <alex.shi@linaro.org> | 2016-05-24 12:18:16 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2016-05-24 12:18:16 +0800 |
| commit | 1d48c75353cb265710f7589f47532e1db06cb64f (patch) | |
| tree | ebfded7d10d45cfb718c76159de227b593716d5c /drivers/md/md.c | |
| parent | 71d97a95427b3c9c11788a8e6dd0117551d29166 (diff) | |
| parent | 0a296a966f183e4ef1fcb37940940e8df8c4f258 (diff) | |
Merge branch 'linux-linaro-lsk-v4.1' into linux-linaro-lsk-v4.1-androidlsk-v4.1-16.05-android
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 78c1f77e7903..72dc91de80f8 100644 --- a/drivers/md/md.c +++ b/drivers/md/md.c @@ -289,6 +289,8 @@ static void 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(); |