1 files changed, 6 insertions, 0 deletions

diff --git a/block/elevator.c b/block/elevator.c
index 816a7c8d6394..ec585c9554d3 100644
--- a/block/elevator.c
+++ b/block/elevator.c
@@ -83,6 +83,12 @@ int elv_rq_merge_ok(struct request *rq, struct bio *bio)
                 return 0;
 
         /*
+         * Don't merge discard requests and secure discard requests
+         */
+        if ((bio->bi_rw & REQ_SECURE) != (rq->bio->bi_rw & REQ_SECURE))
+                return 0;
+
+        /*
          * different data direction or already started, don't merge
          */
         if (bio_data_dir(bio) != rq_data_dir(rq))