projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
dm: use bio op accessors
[cascardo/linux.git]
/
drivers
/
md
/
dm-crypt.c
diff --git
a/drivers/md/dm-crypt.c
b/drivers/md/dm-crypt.c
index
4f3cb35
..
057d19b
100644
(file)
--- a/
drivers/md/dm-crypt.c
+++ b/
drivers/md/dm-crypt.c
@@
-1136,7
+1136,7
@@
static void clone_init(struct dm_crypt_io *io, struct bio *clone)
clone->bi_private = io;
clone->bi_end_io = crypt_endio;
clone->bi_bdev = cc->dev->bdev;
clone->bi_private = io;
clone->bi_end_io = crypt_endio;
clone->bi_bdev = cc->dev->bdev;
-
clone->bi_rw = io->base_bio->bi_rw
;
+
bio_set_op_attrs(clone, bio_op(io->base_bio), io->base_bio->bi_rw)
;
}
static int kcryptd_io_read(struct dm_crypt_io *io, gfp_t gfp)
}
static int kcryptd_io_read(struct dm_crypt_io *io, gfp_t gfp)
@@
-1911,11
+1911,11
@@
static int crypt_map(struct dm_target *ti, struct bio *bio)
struct crypt_config *cc = ti->private;
/*
struct crypt_config *cc = ti->private;
/*
- * If bio is REQ_FLUSH or REQ_DISCARD, just bypass crypt queues.
+ * If bio is REQ_FLUSH or REQ_
OP_
DISCARD, just bypass crypt queues.
* - for REQ_FLUSH device-mapper core ensures that no IO is in-flight
* - for REQ_FLUSH device-mapper core ensures that no IO is in-flight
- * - for REQ_DISCARD caller must use flush if IO ordering matters
+ * - for REQ_
OP_
DISCARD caller must use flush if IO ordering matters
*/
*/
- if (unlikely(bio->bi_rw &
(REQ_FLUSH | REQ_DISCARD)
)) {
+ if (unlikely(bio->bi_rw &
REQ_FLUSH || bio_op(bio) == REQ_OP_DISCARD
)) {
bio->bi_bdev = cc->dev->bdev;
if (bio_sectors(bio))
bio->bi_iter.bi_sector = cc->start +
bio->bi_bdev = cc->dev->bdev;
if (bio_sectors(bio))
bio->bi_iter.bi_sector = cc->start +