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 377d8bd5aba5daf98cb4fda95689da0e70009930..d32a3d885c12d559df18a1a6a8f98f04d1297dec 100644 (file)
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@ -751,16 +751,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 7380f738dda683eb4bc9bdcbc05b9f9d15ba2196..2981eebaea90d1e85539dbbef615c67e3e403bd3 100644 (file)
--- a/include/linux/bio.h
+++ b/include/linux/bio.h
@@ -314,7 +314,6 @@ static inline void bio_next_folio(struct folio_iter *fi, 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 */
 };