commit 7afafc8a44bf0ab841b17d450b02aedb3a138985
author Adrian Hunter <adrian.hunter@intel.com> Tue Aug 16 10:59:35 2016 +0300
committer Jens Axboe <axboe@fb.com> Tue Aug 16 09:16:51 2016 -0600
tree a879b43681ee39a3f3ace3aeacb81f30c96ca00d
parent f6b6a28e2dbc401416ff12f775d75281c9b41918

block: Fix secure erase

Commit 288dab8a35a0 ("block: add a separate operation type for secure
erase") split REQ_OP_SECURE_ERASE from REQ_OP_DISCARD without considering
all the places REQ_OP_DISCARD was being used to mean either. Fix those.

Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
Fixes: 288dab8a35a0 ("block: add a separate operation type for secure erase")
Signed-off-by: Jens Axboe <axboe@fb.com>

block/elevator.c

diff --git a/block/elevator.c b/block/elevator.c
index 7096c22..f7d973a 100644
--- a/block/elevator.c
+++ b/block/elevator.c
@@ -366,7 +366,7 @@
 	list_for_each_prev(entry, &q->queue_head) {
 		struct request *pos = list_entry_rq(entry);
 
-		if ((req_op(rq) == REQ_OP_DISCARD) != (req_op(pos) == REQ_OP_DISCARD))
+		if (req_op(rq) != req_op(pos))
 			break;
 		if (rq_data_dir(rq) != rq_data_dir(pos))
 			break;