diff options
| author | Mark Brown <broonie@kernel.org> | 2020-03-11 18:45:26 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2020-03-11 18:45:26 +0000 |
| commit | 4d90a4e677c5c45c787a774c84442e75c7ddd5be (patch) | |
| tree | 50312d13362dd49615148661ae7e6d91ac349719 /drivers/md/dm-bio-record.h | |
| parent | 9032cdd96a2d4b0ef2f43499328f8a68050be2ec (diff) | |
| parent | 2c523b344dfa65a3738e7039832044aa133c75fb (diff) | |
| download | linux-4d90a4e677c5c45c787a774c84442e75c7ddd5be.tar.bz2 | |
Merge tag 'v5.6-rc5' into asoc-5.7
Linux 5.6-rc5
Diffstat (limited to 'drivers/md/dm-bio-record.h')
| -rw-r--r-- | drivers/md/dm-bio-record.h | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/drivers/md/dm-bio-record.h b/drivers/md/dm-bio-record.h index c82578af56a5..2ea0360108e1 100644 --- a/drivers/md/dm-bio-record.h +++ b/drivers/md/dm-bio-record.h @@ -20,8 +20,13 @@ struct dm_bio_details { struct gendisk *bi_disk; u8 bi_partno; + int __bi_remaining; unsigned long bi_flags; struct bvec_iter bi_iter; + bio_end_io_t *bi_end_io; +#if defined(CONFIG_BLK_DEV_INTEGRITY) + struct bio_integrity_payload *bi_integrity; +#endif }; static inline void dm_bio_record(struct dm_bio_details *bd, struct bio *bio) @@ -30,6 +35,11 @@ static inline void dm_bio_record(struct dm_bio_details *bd, struct bio *bio) bd->bi_partno = bio->bi_partno; bd->bi_flags = bio->bi_flags; bd->bi_iter = bio->bi_iter; + bd->__bi_remaining = atomic_read(&bio->__bi_remaining); + bd->bi_end_io = bio->bi_end_io; +#if defined(CONFIG_BLK_DEV_INTEGRITY) + bd->bi_integrity = bio_integrity(bio); +#endif } static inline void dm_bio_restore(struct dm_bio_details *bd, struct bio *bio) @@ -38,6 +48,11 @@ static inline void dm_bio_restore(struct dm_bio_details *bd, struct bio *bio) bio->bi_partno = bd->bi_partno; bio->bi_flags = bd->bi_flags; bio->bi_iter = bd->bi_iter; + atomic_set(&bio->__bi_remaining, bd->__bi_remaining); + bio->bi_end_io = bd->bi_end_io; +#if defined(CONFIG_BLK_DEV_INTEGRITY) + bio->bi_integrity = bd->bi_integrity; +#endif } #endif |