linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [RFC]block: disable discard request merge temporarily
@ 2012-08-09  5:28 Shaohua Li
  2012-08-09  7:45 ` Christoph Hellwig
  2012-08-09 13:19 ` Jens Axboe
  0 siblings, 2 replies; 3+ messages in thread
From: Shaohua Li @ 2012-08-09  5:28 UTC (permalink / raw)
  To: linux-kernel; +Cc: axboe, hch, martin.petersen, vgoyal, neilb

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>

diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
index 4e72a9d..0e6efb1 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) || \

^ permalink raw reply related	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2012-08-09 13:20 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-08-09  5:28 [RFC]block: disable discard request merge temporarily Shaohua Li
2012-08-09  7:45 ` Christoph Hellwig
2012-08-09 13:19 ` Jens Axboe

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).