From 707a63f9029b85b6ae9a85d159cd84b5a16db486 Mon Sep 17 00:00:00 2001 From: Shaohua Li Date: Thu, 9 Aug 2012 15:20:23 +0200 Subject: [PATCH] --- yaml --- r: 322222 b: refs/heads/master c: 276f0f5d157bb4a816053f4f3a941dbcd4f76556 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/linux/blkdev.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index e091038208ba..aacee4b543c2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 389d7b26d9e4f78b17366c23a3aa16b3c5cb3bde +refs/heads/master: 276f0f5d157bb4a816053f4f3a941dbcd4f76556 diff --git a/trunk/include/linux/blkdev.h b/trunk/include/linux/blkdev.h index dc632975d54f..4a2ab7c85393 100644 --- a/trunk/include/linux/blkdev.h +++ b/trunk/include/linux/blkdev.h @@ -601,7 +601,7 @@ static inline void blk_clear_rl_full(struct request_list *rl, bool sync) * it already be started by driver. */ #define RQ_NOMERGE_FLAGS \ - (REQ_NOMERGE | REQ_STARTED | REQ_SOFTBARRIER | REQ_FLUSH | REQ_FUA) + (REQ_NOMERGE | REQ_STARTED | REQ_SOFTBARRIER | REQ_FLUSH | REQ_FUA | REQ_DISCARD) #define rq_mergeable(rq) \ (!((rq)->cmd_flags & RQ_NOMERGE_FLAGS) && \ (((rq)->cmd_flags & REQ_DISCARD) || \