On 2/14/24 5:06 AM, Ankit Kumar wrote:
> Remove io_u dependency while calculating start and number of lba.
> This is a prep patch for multi-range trim support where an io_u entry
> will contain multiple start offset and buffer len.
>
> Signed-off-by: Ankit Kumar <ankit.kumar@xxxxxxxxxxx>
> ---
> engines/nvme.c | 34 +++++++++++++++++-----------------
> 1 file changed, 17 insertions(+), 17 deletions(-)
>
> diff --git a/engines/nvme.c b/engines/nvme.c
> index 75a5e0c1..e5f17fc7 100644
> --- a/engines/nvme.c
> +++ b/engines/nvme.c
> @@ -8,20 +8,20 @@
> #include "../crc/crc-t10dif.h"
> #include "../crc/crc64.h"
>
> -static inline __u64 get_slba(struct nvme_data *data, struct io_u *io_u)
> +static inline __u64 get_slba(struct nvme_data *data, __u64 offset)
> {
> if (data->lba_ext)
> - return io_u->offset / data->lba_ext;
> + return offset / data->lba_ext;
> else
> - return io_u->offset >> data->lba_shift;
> + return offset >> data->lba_shift;
> }
Same here on redundant else.
> -static inline __u32 get_nlb(struct nvme_data *data, struct io_u *io_u)
> +static inline __u32 get_nlb(struct nvme_data *data, __u64 len)
> {
> if (data->lba_ext)
> - return io_u->xfer_buflen / data->lba_ext - 1;
> + return len / data->lba_ext - 1;
> else
> - return (io_u->xfer_buflen >> data->lba_shift) - 1;
> + return (len >> data->lba_shift) - 1;
> }
Ditto. I know these exist before, but let's please clean them up while
at it.
Apart from that, this one looks fine.
--
Jens Axboe
