- updated to 2.02.177, partial PLD merge

[packages/lvm2.git] / lvm2-clvmd_cmd_timeout.patch

diff --git a/lvm2-clvmd_cmd_timeout.patch b/lvm2-clvmd_cmd_timeout.patch
index ba2b6f879e01e71dd1b3e61670a474e8c30fc638..d1d6e0d7de730f6de435801859055894c95f5266 100644 (file)
--- a/lvm2-clvmd_cmd_timeout.patch
+++ b/lvm2-clvmd_cmd_timeout.patch
@@ -1,25 +1,7 @@
-commit 8b6c9bb794361c75b0aa96bede8a3f71d1dd663e
-Author: Jacek Konieczny <jajcus@jajcus.net>
-Date:   Wed Dec 12 11:59:42 2012 +0100
-
-    clvmd: command timeout handling fix
-    
-    clvmd would wait for select() to time-out before processing command
-    time-outs. The select timeout would be set to the cmd_timeout ('-t'
-    command-line option) value, which is 60 seconds by default.
-    
-    Normally the select() call is woken up more frequently, so the command
-    time-outs are never processed. This causes LVM tools wait forever on
-    cluster locking for operations started during temporary cluster
-    problems.
-    
-    Signed-off-by: Jacek Konieczny <jajcus@jajcus.net>
-
-diff --git a/daemons/clvmd/clvmd.c b/daemons/clvmd/clvmd.c
-index eb0bffd..2b5d753 100644
---- a/daemons/clvmd/clvmd.c
-+++ b/daemons/clvmd/clvmd.c
-@@ -939,8 +939,8 @@ static void main_loop(int local_sock, int cmd_timeout)
+diff -urp LVM2.2.02.177.orig/daemons/clvmd/clvmd.c LVM2.2.02.177/daemons/clvmd/clvmd.c
+--- LVM2.2.02.177.orig/daemons/clvmd/clvmd.c   2017-12-18 20:44:34.000000000 +0000
++++ LVM2.2.02.177/daemons/clvmd/clvmd.c        2018-01-26 16:40:07.504228217 +0000
+@@ -992,8 +992,8 @@ static void main_loop(int cmd_timeout)
                        }
                }
  
@@ -29,4 +11,4 @@ index eb0bffd..2b5d753 100644
 +              if (select_status >= 0) {
                        time_t the_time = time(NULL);
  
-                       for (thisfd = &local_client_head; thisfd != NULL;
+                       for (thisfd = &local_client_head; thisfd; thisfd = thisfd->next) {