projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
UPSTREAM: mmc: core: update mmc.c upstream version
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
md
/
md.c
diff --git
a/drivers/md/md.c
b/drivers/md/md.c
index b1e1f6b9578246c3a834a4c1e75ef8f6972045e6..c57fdf847b4767bb86c8b42548fe221785fd9b2e 100644
(file)
--- a/
drivers/md/md.c
+++ b/
drivers/md/md.c
@@
-293,6
+293,8
@@
static blk_qc_t md_make_request(struct request_queue *q, struct bio *bio)
* go away inside make_request
*/
sectors = bio_sectors(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();
mddev->pers->make_request(mddev, bio);
cpu = part_stat_lock();