Commit 276f0f5d authored by Shaohua Li's avatar Shaohua Li Committed by Jens Axboe
Browse files

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: default avatarShaohua Li <shli@fusionio.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 389d7b26

include/linux/blkdev.h

+1 −1
Original line number Diff line number Diff line
@@ -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) || \

CRA Git | Maintained and supported by SUSTech CRA and CCSE