ublk: remove UBLK_IO_F_INTEGRITY

The ublk protocol has no mechanism to actually transfer the integrity
metadata, so don't define this flag, which requires that an integrity
payload is attached to a bio.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Link: https://lore.kernel.org/r/20220718063013.335531-1-hch@lst.de
Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/drivers/block/ublk_drv.c b/drivers/block/ublk_drv.c
index 42afab25864fc2e9fa45d2a1915c50e880537485..796d8230fb605aed71a83332ad2cfab8c1d7dfc4 100644 (file)
--- a/drivers/block/ublk_drv.c
+++ b/drivers/block/ublk_drv.c
@@ -389,9 +389,6 @@ static inline unsigned int ublk_req_build_flags(struct request *req)
        if (req->cmd_flags & REQ_META)
                flags |= UBLK_IO_F_META;
 
-       if (req->cmd_flags & REQ_INTEGRITY)
-               flags |= UBLK_IO_F_INTEGRITY;
-
        if (req->cmd_flags & REQ_FUA)
                flags |= UBLK_IO_F_FUA;
 

diff --git a/include/uapi/linux/ublk_cmd.h b/include/uapi/linux/ublk_cmd.h
index a3f5e7c21807cc20c4b3fa97f78e0f2eae71cf21..d6879eea2fde02bdb43b01fff56541d7c4ae49b5 100644 (file)
--- a/include/uapi/linux/ublk_cmd.h
+++ b/include/uapi/linux/ublk_cmd.h
@@ -106,7 +106,6 @@ struct ublksrv_ctrl_dev_info {
 #define                UBLK_IO_F_FAILFAST_TRANSPORT    (1U << 9)
 #define                UBLK_IO_F_FAILFAST_DRIVER       (1U << 10)
 #define                UBLK_IO_F_META                  (1U << 11)
-#define                UBLK_IO_F_INTEGRITY             (1U << 12)
 #define                UBLK_IO_F_FUA                   (1U << 13)
 #define                UBLK_IO_F_PREFLUSH              (1U << 14)
 #define                UBLK_IO_F_NOUNMAP               (1U << 15)