block: Replace bi_integrity with bi_special

For commands like REQ_COPY we need a way to pass extra information along
with each bio. Like integrity metadata this information must be
available at the bottom of the stack so bi_private does not suffice.

Rename the existing bi_integrity field to bi_special and make it a union
so we can have different bio extensions for each class of command.

We previously used bi_integrity != NULL as a way to identify whether a
bio had integrity metadata or not. Introduce a REQ_INTEGRITY to be the
indicator now that bi_special can contain different things.

In addition, bio_integrity(bio) will now return a pointer to the
integrity payload (when applicable).

Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Sagi Grimberg <sagig@mellanox.com>
Signed-off-by: Jens Axboe <axboe@fb.com>

1 files changed, 4 insertions, 4 deletions

diff --git a/drivers/scsi/sd_dif.c b/drivers/scsi/sd_dif.c
index a7a691d0af7d..29f0477a8708 100644
--- a/drivers/scsi/sd_dif.c
+++ b/drivers/scsi/sd_dif.c
@@ -383,9 +383,9 @@ void sd_dif_prepare(struct request *rq, sector_t hw_sector,
                 if (bio_flagged(bio, BIO_MAPPED_INTEGRITY))
                         break;
 
-                virt = bio->bi_integrity->bip_iter.bi_sector & 0xffffffff;
+                virt = bio_integrity(bio)->bip_iter.bi_sector & 0xffffffff;
 
-                bip_for_each_vec(iv, bio->bi_integrity, iter) {
+                bip_for_each_vec(iv, bio_integrity(bio), iter) {
                         sdt = kmap_atomic(iv.bv_page)
                                 + iv.bv_offset;
 
@@ -434,9 +434,9 @@ void sd_dif_complete(struct scsi_cmnd *scmd, unsigned int good_bytes)
                 struct bio_vec iv;
                 struct bvec_iter iter;
 
-                virt = bio->bi_integrity->bip_iter.bi_sector & 0xffffffff;
+                virt = bio_integrity(bio)->bip_iter.bi_sector & 0xffffffff;
 
-                bip_for_each_vec(iv, bio->bi_integrity, iter) {
+                bip_for_each_vec(iv, bio_integrity(bio), iter) {
                         sdt = kmap_atomic(iv.bv_page)
                                 + iv.bv_offset;