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 <dwagner@suse.de>

diff --git a/nvme.c b/nvme.c
index b10c087965adcae41fa0b5af00f564323e5830a9..5b0bbae4e2e47dddb76bd7aaddc1f6d71bd97fce 100644 (file)
--- 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) {