[dm-devel] [PATCH] Revert "multipathd: set timeout for CLI commands correctly"
Martin Wilck
mwilck at suse.com
Thu Apr 13 13:11:21 UTC 2017
This reverts commit a002d124723cef3f2bb4fc33899d2613bdfe3924.
uxsock_timeout is in ms (argument to poll()), whereas
parse_cmd() uses the value to add to tv_sec in a struct timespec.
So the previous code was correct.
Signed-off-by: Martin Wilck <mwilck at suse.com>
---
multipathd/main.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/multipathd/main.c b/multipathd/main.c
index 0c61caad..b167cb4c 100644
--- a/multipathd/main.c
+++ b/multipathd/main.c
@@ -1087,7 +1087,7 @@ uxsock_trigger (char * str, char ** reply, int * len, bool is_root,
return 1;
}
- r = parse_cmd(str, reply, len, vecs, uxsock_timeout);
+ r = parse_cmd(str, reply, len, vecs, uxsock_timeout / 1000);
if (r > 0) {
if (r == ETIMEDOUT)
--
2.12.2
More information about the dm-devel
mailing list