summaryrefslogtreecommitdiffstats
path: root/drivers/mmc/card/queue.h
diff options
context:
space:
mode:
authorAdrian Hunter2016-08-16 09:59:35 +0200
committerJens Axboe2016-08-16 17:16:51 +0200
commit7afafc8a44bf0ab841b17d450b02aedb3a138985 (patch)
treea879b43681ee39a3f3ace3aeacb81f30c96ca00d /drivers/mmc/card/queue.h
parentnvme: Prevent controller state invalid transition (diff)
downloadkernel-qcow2-linux-7afafc8a44bf0ab841b17d450b02aedb3a138985.tar.gz
kernel-qcow2-linux-7afafc8a44bf0ab841b17d450b02aedb3a138985.tar.xz
kernel-qcow2-linux-7afafc8a44bf0ab841b17d450b02aedb3a138985.zip
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>
Diffstat (limited to 'drivers/mmc/card/queue.h')
-rw-r--r--drivers/mmc/card/queue.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/mmc/card/queue.h b/drivers/mmc/card/queue.h
index d62531124d54..fee5e1271465 100644
--- a/drivers/mmc/card/queue.h
+++ b/drivers/mmc/card/queue.h
@@ -4,7 +4,9 @@
static inline bool mmc_req_is_special(struct request *req)
{
return req &&
- (req_op(req) == REQ_OP_FLUSH || req_op(req) == REQ_OP_DISCARD);
+ (req_op(req) == REQ_OP_FLUSH ||
+ req_op(req) == REQ_OP_DISCARD ||
+ req_op(req) == REQ_OP_SECURE_ERASE);
}
struct request;