> diff --git a/drivers/nvme/host/nvme.h b/drivers/nvme/host/nvme.h > index 0da94b233fed..ca415cd9571e 100644 > --- a/drivers/nvme/host/nvme.h > +++ b/drivers/nvme/host/nvme.h > @@ -160,6 +160,7 @@ struct nvme_request { > union nvme_result result; > u8 genctr; > u8 retries; > + u8 max_retries; > u8 flags; > u16 status; > struct nvme_ctrl *ctrl; If I understand correctly then per command max_retries count is only needed for zoned devices. why not make struct nvme_request->max_retries field and subsequent code configurable under CONFIG_BLK_DEV_ZONED ? That will avoid increasing size of the nvme_request for !CONFIG_BLK_DEV_ZONED case where per command nvme_request->max_retries has no use. -ck