block: Replace bi_integrity with bi_special

[linux-2.6-block.git] / drivers / scsi / sd_dif.c

diff --git a/drivers/scsi/sd_dif.c b/drivers/scsi/sd_dif.c
index a7a691d0af7d105a431ba3b560a5496acb71d58b..29f0477a870853c8ecac45c9ba2c67d54cdbd2d7 100644 (file)
--- 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;