aboutsummaryrefslogtreecommitdiff
path: root/include/linux/blkdev.h
diff options
context:
space:
mode:
authorShaohua Li <shli@fusionio.com>2012-08-09 15:20:23 +0200
committerJens Axboe <axboe@kernel.dk>2012-08-09 15:20:23 +0200
commit276f0f5d157bb4a816053f4f3a941dbcd4f76556 (patch)
tree96192def39c6cb8dbd6f2ae6b8847aaf20c0dfb4 /include/linux/blkdev.h
parent389d7b26d9e4f78b17366c23a3aa16b3c5cb3bde (diff)
downloadvexpress-lsk-276f0f5d157bb4a816053f4f3a941dbcd4f76556.tar.gz
block: disable discard request merge temporarily
The SCSI discard request merge never worked, and looks no solution for in future, let's disable it temporarily. Signed-off-by: Shaohua Li <shli@fusionio.com> Reviewed-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'include/linux/blkdev.h')
-rw-r--r--include/linux/blkdev.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
index dc632975d54..4a2ab7c8539 100644
--- a/include/linux/blkdev.h
+++ b/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) || \