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 895b56c8f25e3c137afffc41b8a3eb60fe58ac5c..377d8bd5aba5daf98cb4fda95689da0e70009930 100644 (file)
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@ -765,11 +765,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 1cf3738ef1ea6d794271bc619a3072c1474ce46a..7380f738dda683eb4bc9bdcbc05b9f9d15ba2196 100644 (file)
--- a/include/linux/bio.h
+++ b/include/linux/bio.h
@@ -315,7 +315,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 */
 };