block: disable discard request merge temporarily

RFC Applied Shaohua Li 3 participants 3 messages Aug 9, 2012 Block layer

lore

Share & tools

lore

Shaohua Li

author

2012-08-09 05:28 UTC #0 lore raw

RFC 1/1 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 <[email protected]>

include/linux/blkdev.h +1 -1

index 4e72a9d..0e6efb1 100644
@@ -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) || \

Christoph Hellwig

Reviewed-by on v1 1/1

2012-08-09 07:45 UTC #1 lore raw

Quoted 4 lines · Shaohua Li

The SCSI discard request merge never worked, and looks no solution for in future, let's disable it temporarily.
Signed-off-by Shaohua Li <[email protected]>

Looks good and is equivalent to what I proposed over a year aggo,

Reviewed-by Christoph Hellwig <[email protected]>

Jens Axboe

maintainer Applied

2012-08-09 13:20 UTC #2 lore raw

In reply to Shaohua Li

Quoted 2 lines · Shaohua Li

The SCSI discard request merge never worked, and looks no solution for in future, let's disable it temporarily.

Thanks, applied!

Signature · 1 line

Jens Axboe