]> www.infradead.org Git - users/sagi/libnvme.git/commitdiff
Revert "ioctl: Return NVMe status in nvme_directive_send_id_endir()"
authorDaniel Wagner <dwagner@suse.de>
Fri, 12 Apr 2024 10:58:34 +0000 (12:58 +0200)
committerDaniel Wagner <wagi@monom.org>
Fri, 12 Apr 2024 11:17:54 +0000 (13:17 +0200)
This reverts commit 2d2d76fa08bfd0a3f82cb9db051e53992b4bded2.

The result field is undefined for many commands and thus can have random values.
Thus we can't blindly evaluate these for all commands.

Signed-off-by: Daniel Wagner <dwagner@suse.de>
src/nvme/ioctl.c

index 4c9a1bcedf6d51125507123759df02ac0d71cb2f..ba475496f651f44371950c4a985b2528283894d5 100644 (file)
@@ -1533,8 +1533,6 @@ int nvme_directive_send_id_endir(int fd, __u32 nsid, bool endir,
 {
        __u32 cdw12 = NVME_SET(dtype, DIRECTIVE_SEND_IDENTIFY_CDW12_DTYPE) |
                NVME_SET(endir, DIRECTIVE_SEND_IDENTIFY_CDW12_ENDIR);
-       __u32 result = 0;
-       int err;
        struct nvme_directive_send_args args = {
                .args_size = sizeof(args),
                .fd = fd,
@@ -1546,13 +1544,10 @@ int nvme_directive_send_id_endir(int fd, __u32 nsid, bool endir,
                .data_len = sizeof(*id),
                .data = id,
                .timeout = NVME_DEFAULT_IOCTL_TIMEOUT,
-               .result = &result,
+               .result = NULL,
        };
 
-       err = nvme_directive_send(&args);
-       if (err && result)
-               err = result;
-       return err;
+       return nvme_directive_send(&args);
 }
 
 int nvme_directive_recv(struct nvme_directive_recv_args *args)