projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'for-5.15/block-2021-08-30' of git://git.kernel.dk/linux-block
[linux-2.6-microblaze.git]
/
block
/
mq-deadline.c
diff --git
a/block/mq-deadline.c
b/block/mq-deadline.c
index
3692067
..
3c3693c
100644
(file)
--- a/
block/mq-deadline.c
+++ b/
block/mq-deadline.c
@@
-629,6
+629,8
@@
static int dd_request_merge(struct request_queue *q, struct request **rq,
if (elv_bio_merge_ok(__rq, bio)) {
*rq = __rq;
+ if (blk_discard_mergable(__rq))
+ return ELEVATOR_DISCARD_MERGE;
return ELEVATOR_FRONT_MERGE;
}
}