Re: [libvirt PATCH 09/31] m4: virt-sanlock: drop check for sanlock_inq_lockspace

[Ján Tomko]

On a Thursday in 2020, Pavel Hrdina wrote:

This check was introduced by commit
<96a02703daad4dc6663165adbc0feade9900cebd> to guard calling
sanlock_inq_lockspace() function but it used SANLK_INQ_WAIT as a
parameter which was introduced later.  This was eventually fixed by
commit <238dba0f9c925359cb3b8beddd8c8ae739cb4e06>.

We can safely replace check for sanlock_inq_lockspace as that function
was introduced in sanlock-1.9.  The oldest used version, sanlock-2.2,
is by Ubuntu 16.04.

Signed-off-by: Pavel Hrdina 
---
m4/virt-sanlock.m4| 12 
src/locking/lock_driver_sanlock.c |  2 +-
2 files changed, 5 insertions(+), 9 deletions(-)



Reviewed-by: Ján Tomko 

Jano


signature.asc
Description: PGP signature

[libvirt PATCH 09/31] m4: virt-sanlock: drop check for sanlock_inq_lockspace

[Pavel Hrdina]

This check was introduced by commit
<96a02703daad4dc6663165adbc0feade9900cebd> to guard calling
sanlock_inq_lockspace() function but it used SANLK_INQ_WAIT as a
parameter which was introduced later.  This was eventually fixed by
commit <238dba0f9c925359cb3b8beddd8c8ae739cb4e06>.

We can safely replace check for sanlock_inq_lockspace as that function
was introduced in sanlock-1.9.  The oldest used version, sanlock-2.2,
is by Ubuntu 16.04.

Signed-off-by: Pavel Hrdina 
---
 m4/virt-sanlock.m4| 12 
 src/locking/lock_driver_sanlock.c |  2 +-
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/m4/virt-sanlock.m4 b/m4/virt-sanlock.m4
index 00de7980e82..cc35b10b09f 100644
--- a/m4/virt-sanlock.m4
+++ b/m4/virt-sanlock.m4
@@ -29,6 +29,10 @@ AC_DEFUN([LIBVIRT_CHECK_SANLOCK],[
   #include 
   #include 
 ]])
+if test sanlock_inq_wait = 1; then
+  AC_DEFINE_UNQUOTED([HAVE_SANLK_INQ_WAIT], 1,
+[whether sanlock supports SANLK_INQ_WAIT])
+fi
 
 old_cppflags="$CPPFLAGS"
 old_libs="$LIBS"
@@ -42,14 +46,6 @@ AC_DEFUN([LIBVIRT_CHECK_SANLOCK],[
 [whether Sanlock supports sanlock_killpath])
 fi
 
-AC_CHECK_LIB([sanlock_client], [sanlock_inq_lockspace],
-   [sanlock_inq_lockspace=yes], [sanlock_inq_lockspace=no])
-if test "x$sanlock_inq_lockspace" = "xyes" && \
-   test $sanlock_inq_wait = 1; then
-  AC_DEFINE_UNQUOTED([HAVE_SANLOCK_INQ_LOCKSPACE], 1,
-[whether sanlock supports sanlock_inq_lockspace])
-fi
-
 dnl Ideally, we would check for sanlock_add_lockspace_timeout here too, but
 dnl sanlock_write_lockspace has been introduced 2 releases after
 dnl sanlock_add_lockspace_timeout therefore if sanlock_write_lockspace is 
found
diff --git a/src/locking/lock_driver_sanlock.c 
b/src/locking/lock_driver_sanlock.c
index 4ebe98e86db..ea1c23eab69 100644
--- a/src/locking/lock_driver_sanlock.c
+++ b/src/locking/lock_driver_sanlock.c
@@ -361,7 +361,7 @@ 
virLockManagerSanlockSetupLockspace(virLockManagerSanlockDriverPtr driver)
 #endif
 if (rv < 0) {
 if (-rv == EINPROGRESS && --retries) {
-#ifdef HAVE_SANLOCK_INQ_LOCKSPACE
+#ifdef HAVE_SANLK_INQ_WAIT
 /* we have this function which blocks until lockspace change the
  * state. It returns 0 if lockspace has been added, -ENOENT if it
  * hasn't. */
-- 
2.26.2