summaryrefslogtreecommitdiffstats
path: root/include/linux/blkdev.h
diff options
context:
space:
mode:
Diffstat (limited to 'include/linux/blkdev.h')
-rw-r--r--include/linux/blkdev.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
index 78ae3dbf2de1..0c9f8793c87e 100644
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
@@ -666,6 +666,9 @@ static inline bool rq_mergeable(struct request *rq)
666 if (rq->cmd_type != REQ_TYPE_FS) 666 if (rq->cmd_type != REQ_TYPE_FS)
667 return false; 667 return false;
668 668
669 if (req_op(rq) == REQ_OP_FLUSH)
670 return false;
671
669 if (rq->cmd_flags & REQ_NOMERGE_FLAGS) 672 if (rq->cmd_flags & REQ_NOMERGE_FLAGS)
670 return false; 673 return false;
671 674