block: Relocate bio integrity flags

Move flags affecting the integrity code out of the bio bi_flags and into
the block integrity payload.

Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Reviewed-by: Sagi Grimberg <sagig@mellanox.com>
Signed-off-by: Jens Axboe <axboe@fb.com>

diff --git a/block/bio-integrity.c b/block/bio-integrity.c
index e64733bb29b6aa8adc242b74f6740085413bf1c6..26aa901b961f853fca946c2ffaa989a21371c26c 100644 (file)
--- a/block/bio-integrity.c
+++ b/block/bio-integrity.c
@@ -100,7 +100,7 @@ void bio_integrity_free(struct bio *bio)
        struct bio_integrity_payload *bip = bio_integrity(bio);
        struct bio_set *bs = bio->bi_pool;
 
-       if (bip->bip_owns_buf)
+       if (bip->bip_flags & BIP_BLOCK_INTEGRITY)
                kfree(page_address(bip->bip_vec->bv_page) +
                      bip->bip_vec->bv_offset);
 
@@ -293,7 +293,7 @@ int bio_integrity_prep(struct bio *bio)
                return -EIO;
        }
 
-       bip->bip_owns_buf = 1;
+       bip->bip_flags |= BIP_BLOCK_INTEGRITY;
        bip->bip_iter.bi_size = len;
        bip_set_seed(bip, bio->bi_iter.bi_sector);
 

diff --git a/drivers/scsi/sd_dif.c b/drivers/scsi/sd_dif.c
index 1e971c6f8c2b9e70e92f45b211a93174b5b8b40d..4ce636fdc15f9c5305c4128fed53230c5a54e25d 100644 (file)
--- a/drivers/scsi/sd_dif.c
+++ b/drivers/scsi/sd_dif.c
@@ -326,7 +326,7 @@ void sd_dif_prepare(struct request *rq, sector_t hw_sector,
                unsigned int j;
 
                /* Already remapped? */
-               if (bio_flagged(bio, BIO_MAPPED_INTEGRITY))
+               if (bip->bip_flags & BIP_MAPPED_INTEGRITY)
                        break;
 
                virt = bip_get_seed(bip) & 0xffffffff;
@@ -347,7 +347,7 @@ void sd_dif_prepare(struct request *rq, sector_t hw_sector,
                        kunmap_atomic(sdt);
                }
 
-               bio->bi_flags |= (1 << BIO_MAPPED_INTEGRITY);
+               bip->bip_flags |= BIP_MAPPED_INTEGRITY;
        }
 }
 

diff --git a/include/linux/bio.h b/include/linux/bio.h
index 3fd36660fd1094b0fff91d411211790c3b8fc11f..b508cf69206d7aa073e190ccbf2b3f24da13e9d9 100644 (file)
--- a/include/linux/bio.h
+++ b/include/linux/bio.h
@@ -315,7 +315,7 @@ struct bio_integrity_payload {
        unsigned short          bip_slab;       /* slab the bip came from */
        unsigned short          bip_vcnt;       /* # of integrity bio_vecs */
        unsigned short          bip_max_vcnt;   /* integrity bio_vec slots */
-       unsigned                bip_owns_buf:1; /* should free bip_buf */
+       unsigned short          bip_flags;      /* control flags */
 
        struct work_struct      bip_work;       /* I/O completion */
 
@@ -323,6 +323,13 @@ struct bio_integrity_payload {
        struct bio_vec          bip_inline_vecs[0];/* embedded bvec array */
 };
 
+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 */
+};
+
 static inline sector_t bip_get_seed(struct bio_integrity_payload *bip)
 {
        return bip->bip_iter.bi_sector;

diff --git a/include/linux/blk_types.h b/include/linux/blk_types.h
index 6a5d2f2de1b9ee551cf26a14e4c14ffeae100108..38bc008e450323da7b72b363bb28ff3bfff9df6b 100644 (file)
--- a/include/linux/blk_types.h
+++ b/include/linux/blk_types.h
@@ -120,10 +120,8 @@ struct bio {
 #define BIO_USER_MAPPED 6      /* contains user pages */
 #define BIO_EOPNOTSUPP 7       /* not supported */
 #define BIO_NULL_MAPPED 8      /* contains invalid user pages */
-#define BIO_FS_INTEGRITY 9     /* fs owns integrity data, not block layer */
-#define BIO_QUIET      10      /* Make BIO Quiet */
-#define BIO_MAPPED_INTEGRITY 11/* integrity metadata has been remapped */
-#define BIO_SNAP_STABLE        12      /* bio data must be snapshotted during write */
+#define BIO_QUIET      9       /* Make BIO Quiet */
+#define BIO_SNAP_STABLE        10      /* bio data must be snapshotted during write */
 
 /*
  * Flags starting here get preserved by bio_reset() - this includes