block: remove BIP_DISK_NOCHECK

Remove the never set BIP_DISK_NOCHECK flag.

Signed-off-by: Christoph Hellwig <hch@lst.de>

diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
index d3ff723af879bbaa88ba204b0e4585ab55ba756f..d831aae382d3e939c6b003415de93551fe3e4a05 100644 (file)
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@ -800,11 +800,7 @@ static unsigned char sd_setup_protect_cmnd(struct scsi_cmnd *scmd,
 
        if (dif) {                              /* DIX/DIF Type 1, 2, 3 */
                scmd->prot_flags |= SCSI_PROT_TRANSFER_PI;
-
-               if (bio_integrity_flagged(bio, BIP_DISK_NOCHECK))
-                       protect = 3 << 5;       /* Disable target PI checking */
-               else
-                       protect = 1 << 5;       /* Enable target PI checking */
+               protect = 1 << 5;       /* Enable target PI checking */
        }
 
        scsi_set_prot_op(scmd, prot_op);

diff --git a/include/linux/bio.h b/include/linux/bio.h
index 169b14b10c169dd581fbb03432cac197352773d6..6dcd677422b1de7d1d991a3d440485f1e1bfee47 100644 (file)
--- a/include/linux/bio.h
+++ b/include/linux/bio.h
@@ -321,7 +321,6 @@ enum bip_flags {
        BIP_BLOCK_INTEGRITY     = 1 << 0, /* block layer owns integrity data */
        BIP_MAPPED_INTEGRITY    = 1 << 1, /* ref tag has been remapped */
        BIP_CTRL_NOCHECK        = 1 << 2, /* disable HBA integrity checking */
-       BIP_DISK_NOCHECK        = 1 << 3, /* disable disk integrity checking */
        BIP_IP_CHECKSUM         = 1 << 4, /* IP checksum */
 };