From ee0816ea348c805692a622ea405a60a9ba329b15 Mon Sep 17 00:00:00 2001 From: Daniel Wagner Date: Mon, 20 Dec 2021 16:34:35 +0100 Subject: [PATCH] nvme: Use libnvme helper to retrieve logical block size Use the libnvme helper nvme_get_logical_block_size to figure out the logical block size. This way we have support for normal char devices (nvme%d) and for generic devices (ng%d%d). Signed-off-by: Daniel Wagner --- nvme.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/nvme.c b/nvme.c index b10c0879..5b0bbae4 100644 --- a/nvme.c +++ b/nvme.c @@ -5665,8 +5665,9 @@ static int submit_io(int opcode, char *command, const char *desc, goto close_mfd; } - if (ioctl(fd, BLKSSZGET, &logical_block_size) < 0) - goto close_mfd; + if (nvme_get_logical_block_size(fd, cfg.namespace_id, + &logical_block_size) < 0) + goto close_mfd; buffer_size = (cfg.block_count + 1) * logical_block_size; if (cfg.data_size < buffer_size) { -- 2.50.1