block: remove BIP_CTRL_NOCHECK

Remove the never set BIP_CTRL_NOCHECK flag.

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

diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
index d831aae382d3e939c6b003415de93551fe3e4a05..8bbb9192f3868c26ed582a06c94491e52b0607f5 100644 (file)
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@ -786,16 +786,12 @@ static unsigned char sd_setup_protect_cmnd(struct scsi_cmnd *scmd,
        if (dix) {                              /* DIX Type 0, 1, 2, 3 */
                if (bio_integrity_flagged(bio, BIP_IP_CHECKSUM))
                        scmd->prot_flags |= SCSI_PROT_IP_CHECKSUM;
-
-               if (bio_integrity_flagged(bio, BIP_CTRL_NOCHECK) == false)
-                       scmd->prot_flags |= SCSI_PROT_GUARD_CHECK;
+               scmd->prot_flags |= SCSI_PROT_GUARD_CHECK;
        }
 
        if (dif != T10_PI_TYPE3_PROTECTION) {   /* DIX/DIF Type 0, 1, 2 */
                scmd->prot_flags |= SCSI_PROT_REF_INCREMENT;
-
-               if (bio_integrity_flagged(bio, BIP_CTRL_NOCHECK) == false)
-                       scmd->prot_flags |= SCSI_PROT_REF_CHECK;
+               scmd->prot_flags |= SCSI_PROT_REF_CHECK;
        }
 
        if (dif) {                              /* DIX/DIF Type 1, 2, 3 */

diff --git a/include/linux/bio.h b/include/linux/bio.h
index 6dcd677422b1de7d1d991a3d440485f1e1bfee47..3d3acae7ed2e1c4343d50347dd42ede8d5434adf 100644 (file)
--- a/include/linux/bio.h
+++ b/include/linux/bio.h
@@ -320,7 +320,6 @@ static inline struct bio_vec *bio_last_bvec_all(struct bio *bio)
 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_IP_CHECKSUM         = 1 << 4, /* IP checksum */
 };