aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristoph Hellwig <[email protected]>2022-07-18 08:30:13 +0200
committerJens Axboe <[email protected]>2022-07-18 13:10:47 -0600
commitd276a22314c2bad9136c5e0b09eb3c8a560e1161 (patch)
treee45c88ec000ada2256c86335430c8cf051578fa2
parent6b1439d203a3c3d7adcf31ba70734eb95f8fa02d (diff)
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 <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Jens Axboe <[email protected]>
-rw-r--r--drivers/block/ublk_drv.c3
-rw-r--r--include/uapi/linux/ublk_cmd.h1
2 files changed, 0 insertions, 4 deletions
diff --git a/drivers/block/ublk_drv.c b/drivers/block/ublk_drv.c
index 42afab25864f..796d8230fb60 100644
--- 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 a3f5e7c21807..d6879eea2fde 100644
--- 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)