block: Fix secure erase
authorAdrian Hunter <adrian.hunter@intel.com>
Tue, 16 Aug 2016 07:59:35 +0000 (10:59 +0300)
committerJens Axboe <axboe@fb.com>
Tue, 16 Aug 2016 15:16:51 +0000 (09:16 -0600)
commit7afafc8a44bf0ab841b17d450b02aedb3a138985
treea879b43681ee39a3f3ace3aeacb81f30c96ca00d
parentf6b6a28e2dbc401416ff12f775d75281c9b41918
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/bio.c
block/blk-merge.c
block/elevator.c
drivers/mmc/card/block.c
drivers/mmc/card/queue.c
drivers/mmc/card/queue.h
include/linux/bio.h
include/linux/blkdev.h
kernel/trace/blktrace.c