Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[linux-2.6-block.git] / block / blk-merge.c

diff --git a/block/blk-merge.c b/block/blk-merge.c
index e7696c47489ad1f8caa11a64ff8fdb2b6d0f41a2..7695034f4b87fa382237435e0b614ac086c58ee8 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);
 
        /*