Skip to content

Commit b2503e9

Browse files
Stanley Zhangaxboe
authored andcommitted
ublk: support UBLK_F_INTEGRITY
Now that all the components of the ublk integrity feature have been implemented, add UBLK_F_INTEGRITY to UBLK_F_ALL, conditional on block layer integrity support (CONFIG_BLK_DEV_INTEGRITY). This allows ublk servers to create ublk devices with UBLK_F_INTEGRITY set and UBLK_U_CMD_GET_FEATURES to report the feature as supported. Signed-off-by: Stanley Zhang <stazhang@purestorage.com> [csander: make feature conditional on CONFIG_BLK_DEV_INTEGRITY] Signed-off-by: Caleb Sander Mateos <csander@purestorage.com> Reviewed-by: Ming Lei <ming.lei@redhat.com> Signed-off-by: Jens Axboe <axboe@kernel.dk>
1 parent be82a89 commit b2503e9

1 file changed

Lines changed: 2 additions & 1 deletion

File tree

drivers/block/ublk_drv.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,8 @@
7575
| UBLK_F_AUTO_BUF_REG \
7676
| UBLK_F_QUIESCE \
7777
| UBLK_F_PER_IO_DAEMON \
78-
| UBLK_F_BUF_REG_OFF_DAEMON)
78+
| UBLK_F_BUF_REG_OFF_DAEMON \
79+
| (IS_ENABLED(CONFIG_BLK_DEV_INTEGRITY) ? UBLK_F_INTEGRITY : 0))
7980

8081
#define UBLK_F_ALL_RECOVERY_FLAGS (UBLK_F_USER_RECOVERY \
8182
| UBLK_F_USER_RECOVERY_REISSUE \

0 commit comments

Comments
 (0)