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>

1 files changed, 14 insertions, 11 deletions

diff --git a/block/blk-lib.c b/block/blk-lib.c
index ff2a7f04af4d..78626c2fde33 100644
--- a/block/blk-lib.c
+++ b/block/blk-lib.c
@@ -23,20 +23,27 @@ static struct bio *next_bio(struct bio *bio, unsigned int nr_pages,
 }
 
 int __blkdev_issue_discard(struct block_device *bdev, sector_t sector,
-                sector_t nr_sects, gfp_t gfp_mask, int op_flags,
+                sector_t nr_sects, gfp_t gfp_mask, int flags,
                 struct bio **biop)
 {
         struct request_queue *q = bdev_get_queue(bdev);
         struct bio *bio = *biop;
         unsigned int granularity;
+        enum req_op op;
         int alignment;
 
         if (!q)
                 return -ENXIO;
-        if (!blk_queue_discard(q))
-                return -EOPNOTSUPP;
-        if ((op_flags & REQ_SECURE) && !blk_queue_secdiscard(q))
-                return -EOPNOTSUPP;
+
+        if (flags & BLKDEV_DISCARD_SECURE) {
+                if (!blk_queue_secure_erase(q))
+                        return -EOPNOTSUPP;
+                op = REQ_OP_SECURE_ERASE;
+        } else {
+                if (!blk_queue_discard(q))
+                        return -EOPNOTSUPP;
+                op = REQ_OP_DISCARD;
+        }
 
         /* Zero-sector (unknown) and one-sector granularities are the same.  */
         granularity = max(q->limits.discard_granularity >> 9, 1U);
@@ -66,7 +73,7 @@ int __blkdev_issue_discard(struct block_device *bdev, sector_t sector,
                 bio = next_bio(bio, 1, gfp_mask);
                 bio->bi_iter.bi_sector = sector;
                 bio->bi_bdev = bdev;
-                bio_set_op_attrs(bio, REQ_OP_DISCARD, op_flags);
+                bio_set_op_attrs(bio, op, 0);
 
                 bio->bi_iter.bi_size = req_sects << 9;
                 nr_sects -= req_sects;
@@ -100,16 +107,12 @@ EXPORT_SYMBOL(__blkdev_issue_discard);
 int blkdev_issue_discard(struct block_device *bdev, sector_t sector,
                 sector_t nr_sects, gfp_t gfp_mask, unsigned long flags)
 {
-        int op_flags = 0;
         struct bio *bio = NULL;
         struct blk_plug plug;
         int ret;
 
-        if (flags & BLKDEV_DISCARD_SECURE)
-                op_flags |= REQ_SECURE;
-
         blk_start_plug(&plug);
-        ret = __blkdev_issue_discard(bdev, sector, nr_sects, gfp_mask, op_flags,
+        ret = __blkdev_issue_discard(bdev, sector, nr_sects, gfp_mask, flags,
                         &bio);
         if (!ret && bio) {
                 ret = submit_bio_wait(bio);