diff options
| author | Adrian Hunter <adrian.hunter@intel.com> | 2016-08-16 10:59:35 +0300 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2016-08-16 09:16:51 -0600 |
| commit | 7afafc8a44bf0ab841b17d450b02aedb3a138985 (patch) | |
| tree | a879b43681ee39a3f3ace3aeacb81f30c96ca00d /block/bio.c | |
| parent | f6b6a28e2dbc401416ff12f775d75281c9b41918 (diff) | |
| download | linux-0-day-7afafc8a44bf0ab841b17d450b02aedb3a138985.tar.gz linux-0-day-7afafc8a44bf0ab841b17d450b02aedb3a138985.tar.xz | |
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 'block/bio.c')
| -rw-r--r-- | block/bio.c | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/block/bio.c b/block/bio.c index f39477538fef0..aa7354088008b 100644 --- a/block/bio.c +++ b/block/bio.c @@ -667,18 +667,19 @@ struct bio *bio_clone_bioset(struct bio *bio_src, gfp_t gfp_mask, bio->bi_iter.bi_sector = bio_src->bi_iter.bi_sector; bio->bi_iter.bi_size = bio_src->bi_iter.bi_size; - if (bio_op(bio) == REQ_OP_DISCARD) - goto integrity_clone; - - if (bio_op(bio) == REQ_OP_WRITE_SAME) { + switch (bio_op(bio)) { + case REQ_OP_DISCARD: + case REQ_OP_SECURE_ERASE: + break; + case REQ_OP_WRITE_SAME: bio->bi_io_vec[bio->bi_vcnt++] = bio_src->bi_io_vec[0]; - goto integrity_clone; + break; + default: + bio_for_each_segment(bv, bio_src, iter) + bio->bi_io_vec[bio->bi_vcnt++] = bv; + break; } - bio_for_each_segment(bv, bio_src, iter) - bio->bi_io_vec[bio->bi_vcnt++] = bv; - -integrity_clone: if (bio_integrity(bio_src)) { int ret; @@ -1788,7 +1789,7 @@ struct bio *bio_split(struct bio *bio, int sectors, * Discards need a mutable bio_vec to accommodate the payload * required by the DSM TRIM and UNMAP commands. */ - if (bio_op(bio) == REQ_OP_DISCARD) + if (bio_op(bio) == REQ_OP_DISCARD || bio_op(bio) == REQ_OP_SECURE_ERASE) split = bio_clone_bioset(bio, gfp, bs); else split = bio_clone_fast(bio, gfp, bs); |