Fix unlocks in clvmd-corosync.

The DLM unlock returns EUNLOCK in the lksb on success, not 0

diff --git a/WHATS_NEW b/WHATS_NEW
index c1a5b89ae5a0ea4928e4ecc530e383471e1ea8c9..e039108f8a449a56095fee0607924ffda6160be6 100644 (file)
--- a/WHATS_NEW
+++ b/WHATS_NEW
@@ -1,6 +1,7 @@
 Version 2.02.46 - 
 ================================
   Flush memory pool and fix locking in clvmd refresh and backup command.
+  Fix unlocks in clvmd-corosync. Broken in 2.02.45.
 
 Version 2.02.45 - 3rd March 2009
 ================================

diff --git a/daemons/clvmd/clvmd-corosync.c b/daemons/clvmd/clvmd-corosync.c
index 27819ace85f59c498139c9ec97ef131df2c0cb7b..9cacc30c63f83c99e3db5d13536e3a8fd2e33784 100644 (file)
--- a/daemons/clvmd/clvmd-corosync.c
+++ b/daemons/clvmd/clvmd-corosync.c
@@ -510,7 +510,7 @@ static int _unlock_resource(const char *resource, int lockid)
                DEBUGLOG("Unlock returned %d\n", err);
                return err;
        }
-       if (lksb.sb_status != 0)
+       if (lksb.sb_status != EUNLOCK)
        {
                DEBUGLOG("dlm_ls_unlock_wait returns lksb.sb_status: %d\n", lksb.sb_status);
                errno = lksb.sb_status;