On Mon, Jan 05, 2026 at 05:57:42PM -0700, Caleb Sander Mateos wrote: > From: Stanley Zhang <[email protected]> > > 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 <[email protected]> > [csander: make feature conditional on CONFIG_BLK_DEV_INTEGRITY] > Signed-off-by: Caleb Sander Mateos <[email protected]> > --- > drivers/block/ublk_drv.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/drivers/block/ublk_drv.c b/drivers/block/ublk_drv.c > index 9694a4c1caa7..4ffafbfcde3c 100644 > --- a/drivers/block/ublk_drv.c > +++ b/drivers/block/ublk_drv.c > @@ -73,11 +73,12 @@ > | UBLK_F_USER_RECOVERY_FAIL_IO \ > | UBLK_F_UPDATE_SIZE \ > | UBLK_F_AUTO_BUF_REG \ > | UBLK_F_QUIESCE \ > | UBLK_F_PER_IO_DAEMON \ > - | UBLK_F_BUF_REG_OFF_DAEMON) > + | UBLK_F_BUF_REG_OFF_DAEMON \ > + | (IS_ENABLED(CONFIG_BLK_DEV_INTEGRITY) ? UBLK_F_INTEGRITY : 0))
Reviewed-by: Ming Lei <[email protected]> Thanks, Ming
