[libvirt PATCH 13/31] m4: virt-sanlock: drop check for sanlock_write_lockspace()

Function sanlock_write_lockspace() was introduced in 2.7 version which is available in all supported OSes. Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com&gt; --- m4/virt-sanlock.m4 | 11 ----------- src/locking/lock_driver_sanlock.c | 19 ------------------- 2 files changed, 30 deletions(-) diff --git a/m4/virt-sanlock.m4 b/m4/virt-sanlock.m4 index bf8c87866e5..eb05ab6934b 100644 --- a/m4/virt-sanlock.m4 +++ b/m4/virt-sanlock.m4 @@ -30,17 +30,6 @@ AC_DEFUN([LIBVIRT_CHECK_SANLOCK],[ CPPFLAGS="$CPPFLAGS $SANLOCK_CFLAGS" LIBS="$LIBS $SANLOCK_LIBS" - 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 - dnl it is safe to assume sanlock_add_lockspace_timeout is present too. - AC_CHECK_LIB([sanlock_client], [sanlock_write_lockspace], - [sanlock_write_lockspace=yes], [sanlock_write_lockspace=no]) - if test "x$sanlock_write_lockspace" = "xyes" ; then - AC_DEFINE_UNQUOTED([HAVE_SANLOCK_IO_TIMEOUT], 1, - [whether sanlock supports sanlock_write_lockspace]) - fi - AC_CHECK_LIB([sanlock_client], [sanlock_strerror], [sanlock_strerror=yes], [sanlock_strerror=no]) if test "x$sanlock_strerror" = "xyes" ; then diff --git a/src/locking/lock_driver_sanlock.c b/src/locking/lock_driver_sanlock.c index 2f1eded1247..a37a298cf5a 100644 --- a/src/locking/lock_driver_sanlock.c +++ b/src/locking/lock_driver_sanlock.c @@ -178,20 +178,10 @@ virLockManagerSanlockInitLockspace(virLockManagerSanlockDriverPtr driver, { int ret; -#ifdef HAVE_SANLOCK_IO_TIMEOUT const int max_hosts = 0; /* defaults used in sanlock_init() implementation */ const unsigned int lockspaceFlags = 0; ret = sanlock_write_lockspace(ls, max_hosts, lockspaceFlags, driver->io_timeout); -#else - if (driver->io_timeout) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("unable to use io_timeout with this version of sanlock")); - return -ENOTSUP; - } - - ret = sanlock_init(ls, NULL, 0, 0); -#endif return ret; } @@ -349,16 +339,7 @@ virLockManagerSanlockSetupLockspace(virLockManagerSanlockDriverPtr driver) * or we can fallback to polling. */ retry: -#ifdef HAVE_SANLOCK_IO_TIMEOUT rv = sanlock_add_lockspace_timeout(&ls, 0, driver->io_timeout); -#else - if (driver->io_timeout) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("unable to use io_timeout with this version of sanlock")); - goto error; - } - rv = sanlock_add_lockspace(&ls, 0); -#endif if (rv < 0) { if (-rv == EINPROGRESS && --retries) { /* we have this function which blocks until lockspace change the -- 2.26.2