OSDN Git Service
(root)
/
uclinux-h8
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'opp/linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm
[uclinux-h8/linux.git]
/
block
/
blk-merge.c
diff --git
a/block/blk-merge.c
b/block/blk-merge.c
index
e7696c4
..
7695034
100644
(file)
--- a/
block/blk-merge.c
+++ b/
block/blk-merge.c
@@
-820,7
+820,7
@@
static struct request *attempt_merge(struct request_queue *q,
req->__data_len += blk_rq_bytes(next);
- if (
req_op(req) != REQ_OP_DISCARD
)
+ if (
!blk_discard_mergable(req)
)
elv_merge_requests(q, req, next);
/*