From: Steven Seungcheol Lee <sc108.lee@samsung.com>
Date: Fri, 28 Apr 2023 02:08:21 +0000 (+0900)
Subject: nvme-wrap: do_admin_args_op should not clear args timeout
X-Git-Tag: v2.5~136
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=9e6cc62d470748076ce80dfce64429785fbbb354;p=users%2Fsagi%2Fnvme-cli.git

nvme-wrap: do_admin_args_op should not clear args timeout

if set with NVME_DEFAULT_IOCTL_TIMEOUT, timeout parameter always ignored

Signed-off-by: Steven Seungcheol Lee <sc108.lee@samsung.com>
Reported-by: Daseul Lee <daseul.lee@samsung.com>
---

diff --git a/nvme-wrap.c b/nvme-wrap.c
index 4d2906a9..faea6900 100644
--- a/nvme-wrap.c
+++ b/nvme-wrap.c
@@ -40,7 +40,6 @@
 	int __rc;							\
 	if (d->type == NVME_DEV_DIRECT) {				\
 		args->fd = d->direct.fd;				\
-		args->timeout = NVME_DEFAULT_IOCTL_TIMEOUT;		\
 		__rc = nvme_ ## op(args);				\
 	} else if (d->type == NVME_DEV_MI)				\
 		__rc = nvme_mi_admin_ ## op (d->mi.ctrl, args);		\