1 files changed, 4 insertions, 1 deletions

diff --git a/block/blk-core.c b/block/blk-core.c
index 7da630e25ae7..ee1a1e7e63cc 100644
--- a/block/blk-core.c
+++ b/block/blk-core.c
@@ -1514,7 +1514,10 @@ static inline void __generic_make_request(struct bio *bio)
                 if (bio_check_eod(bio, nr_sectors))
                         goto end_io;
 
-                if ((bio->bi_rw & REQ_DISCARD) && !blk_queue_discard(q)) {
+                if ((bio->bi_rw & REQ_DISCARD) &&
+                    (!blk_queue_discard(q) ||
+                     ((bio->bi_rw & REQ_SECURE) &&
+                      !blk_queue_secdiscard(q)))) {
                         err = -EOPNOTSUPP;
                         goto end_io;
                 }