diff options
| author | Mikulas Patocka | 2015-11-25 22:03:31 +0100 |
|---|---|---|
| committer | Mike Snitzer | 2015-12-10 16:38:56 +0100 |
| commit | fe3265b180d6282648f03bc6ac3958c733df01c2 (patch) | |
| tree | acf20a7a1efed26556b258a6f6339167bff59202 /drivers/md/dm-verity.c | |
| parent | dm thin metadata: make dm_thin_find_mapped_range() atomic (diff) | |
| download | kernel-qcow2-linux-fe3265b180d6282648f03bc6ac3958c733df01c2.tar.gz kernel-qcow2-linux-fe3265b180d6282648f03bc6ac3958c733df01c2.tar.xz kernel-qcow2-linux-fe3265b180d6282648f03bc6ac3958c733df01c2.zip | |
dm: don't save and restore bi_private
Device mapper used the field bi_private to point to dm_target_io. However,
since kernel 3.15, the bi_private field is unused, and so the targets do
not need to save and restore this field.
This patch removes code that saves and restores bi_private from dm-cache,
dm-snapshot and dm-verity.
Signed-off-by: Mikulas Patocka <mpatocka@redhat.com>
Signed-off-by: Mike Snitzer <snitzer@redhat.com>
Diffstat (limited to 'drivers/md/dm-verity.c')
| -rw-r--r-- | drivers/md/dm-verity.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/md/dm-verity.c b/drivers/md/dm-verity.c index ccf41886ebcf..9e8891507c1c 100644 --- a/drivers/md/dm-verity.c +++ b/drivers/md/dm-verity.c @@ -83,9 +83,8 @@ struct dm_verity { struct dm_verity_io { struct dm_verity *v; - /* original values of bio->bi_end_io and bio->bi_private */ + /* original value of bio->bi_end_io */ bio_end_io_t *orig_bi_end_io; - void *orig_bi_private; sector_t block; unsigned n_blocks; @@ -453,7 +452,6 @@ static void verity_finish_io(struct dm_verity_io *io, int error) struct bio *bio = dm_bio_from_per_bio_data(io, v->ti->per_bio_data_size); bio->bi_end_io = io->orig_bi_end_io; - bio->bi_private = io->orig_bi_private; bio->bi_error = error; bio_endio(bio); @@ -566,7 +564,6 @@ static int verity_map(struct dm_target *ti, struct bio *bio) io = dm_per_bio_data(bio, ti->per_bio_data_size); io->v = v; io->orig_bi_end_io = bio->bi_end_io; - io->orig_bi_private = bio->bi_private; io->block = bio->bi_iter.bi_sector >> (v->data_dev_block_bits - SECTOR_SHIFT); io->n_blocks = bio->bi_iter.bi_size >> v->data_dev_block_bits; |