1 files changed, 10 insertions, 12 deletions

diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
index 4a2ab7c85393..3a6fea7460f1 100644
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
@@ -540,8 +540,7 @@ static inline void queue_flag_clear(unsigned int flag, struct request_queue *q)
 
 #define blk_account_rq(rq) \
         (((rq)->cmd_flags & REQ_STARTED) && \
-         ((rq)->cmd_type == REQ_TYPE_FS || \
-          ((rq)->cmd_flags & REQ_DISCARD)))
+         ((rq)->cmd_type == REQ_TYPE_FS))
 
 #define blk_pm_request(rq)      \
         ((rq)->cmd_type == REQ_TYPE_PM_SUSPEND || \
@@ -595,17 +594,16 @@ static inline void blk_clear_rl_full(struct request_list *rl, bool sync)
         rl->flags &= ~flag;
 }
 
+static inline bool rq_mergeable(struct request *rq)
+{
+        if (rq->cmd_type != REQ_TYPE_FS)
+                return false;
 
-/*
- * mergeable request must not have _NOMERGE or _BARRIER bit set, nor may
- * it already be started by driver.
- */
-#define RQ_NOMERGE_FLAGS        \
-        (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) || \
-          (rq)->cmd_type == REQ_TYPE_FS))
+        if (rq->cmd_flags & REQ_NOMERGE_FLAGS)
+                return false;
+
+        return true;
+}
 
 /*
  * q->prep_rq_fn return values