[PATCH 02/12] block: remove the unused BIP_{CTRL,DISK}_NOCHECK flags

[Christoph Hellwig]

Both flags are only checked, but never set.

Signed-off-by: Christoph Hellwig <h...@lst.de>
---
 drivers/scsi/sd.c   | 14 +++-----------
 include/linux/bio.h |  2 --
 2 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
index d957e29b17a98a..b477383ccc3b2a 100644
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@ -806,25 +806,17 @@ 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 */
                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 d5379548d684e1..ec5dcf8635ac66 100644
--- a/include/linux/bio.h
+++ b/include/linux/bio.h
@@ -324,8 +324,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_DISK_NOCHECK        = 1 << 3, /* disable disk integrity checking */
        BIP_IP_CHECKSUM         = 1 << 4, /* IP checksum */
        BIP_INTEGRITY_USER      = 1 << 5, /* Integrity payload is user address 
*/
        BIP_COPY_USER           = 1 << 6, /* Kernel bounce buffer in use */
-- 
2.43.0