From: Daniel Wagner <dwagner@suse.de>
Date: Mon, 20 Dec 2021 15:34:35 +0000 (+0100)
Subject: nvme: Use libnvme helper to retrieve logical block size
X-Git-Tag: v2.0-rc0~7^2
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=ee0816ea348c805692a622ea405a60a9ba329b15;p=users%2Fsagi%2Fnvme-cli.git

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 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) {