block: Relocate bio integrity flags

Move flags affecting the integrity code out of the bio bi_flags and into
the block integrity payload.

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

1 files changed, 2 insertions, 2 deletions

diff --git a/drivers/scsi/sd_dif.c b/drivers/scsi/sd_dif.c
index 1e971c6f8c2b..4ce636fdc15f 100644
--- a/drivers/scsi/sd_dif.c
+++ b/drivers/scsi/sd_dif.c
@@ -326,7 +326,7 @@ void sd_dif_prepare(struct request *rq, sector_t hw_sector,
                 unsigned int j;
 
                 /* Already remapped? */
-                if (bio_flagged(bio, BIO_MAPPED_INTEGRITY))
+                if (bip->bip_flags & BIP_MAPPED_INTEGRITY)
                         break;
 
                 virt = bip_get_seed(bip) & 0xffffffff;
@@ -347,7 +347,7 @@ void sd_dif_prepare(struct request *rq, sector_t hw_sector,
                         kunmap_atomic(sdt);
                 }
 
-                bio->bi_flags |= (1 << BIO_MAPPED_INTEGRITY);
+                bip->bip_flags |= BIP_MAPPED_INTEGRITY;
         }
 }