diff options
| author | Christoph Hellwig <hch@lst.de> | 2016-06-09 16:00:36 +0200 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2016-06-09 09:52:25 -0600 |
| commit | 288dab8a35a0bde426a09870943c8d3ee3a50dab (patch) | |
| tree | 483fd3eb60ff8f44d149fb28d3b79e5212645104 /drivers/mmc/card/block.c | |
| parent | 56332f02a562390a3198525ad78cb4f558805c0f (diff) | |
| download | linux-288dab8a35a0bde426a09870943c8d3ee3a50dab.tar.gz linux-288dab8a35a0bde426a09870943c8d3ee3a50dab.tar.bz2 linux-288dab8a35a0bde426a09870943c8d3ee3a50dab.zip | |
block: add a separate operation type for secure erase
Instead of overloading the discard support with the REQ_SECURE flag.
Use the opportunity to rename the queue flag as well, and remove the
dead checks for this flag in the RAID 1 and RAID 10 drivers that don't
claim support for secure erase.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'drivers/mmc/card/block.c')
| -rw-r--r-- | drivers/mmc/card/block.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/mmc/card/block.c b/drivers/mmc/card/block.c index bca20f88a8b2..383184743f9a 100644 --- a/drivers/mmc/card/block.c +++ b/drivers/mmc/card/block.c @@ -2167,10 +2167,12 @@ static int mmc_blk_issue_rq(struct mmc_queue *mq, struct request *req) /* complete ongoing async transfer before issuing discard */ if (card->host->areq) mmc_blk_issue_rw_rq(mq, NULL); - if (req->cmd_flags & REQ_SECURE) - ret = mmc_blk_issue_secdiscard_rq(mq, req); - else - ret = mmc_blk_issue_discard_rq(mq, req); + ret = mmc_blk_issue_discard_rq(mq, req); + } else if (req && req_op(req) == REQ_OP_SECURE_ERASE) { + /* complete ongoing async transfer before issuing secure erase*/ + if (card->host->areq) + mmc_blk_issue_rw_rq(mq, NULL); + ret = mmc_blk_issue_secdiscard_rq(mq, req); } else if (req && req_op(req) == REQ_OP_FLUSH) { /* complete ongoing async transfer before issuing flush */ if (card->host->areq) |