---

yaml --- r: 322222 b: refs/heads/master c: 276f0f5 h: refs/heads/master v: v3
git-mirror · Aug 9, 2012 · 707a63f · 707a63f
1 parent 1d7c598
commit 707a63f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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) || \