Proper mask lock mode for vg lock.

Lock mode is int masked by LCK_TYPE_MASK, always.

Patch also remove uneccessary masking lock flag on sender side,
if masking is needed, it is don on client side already.

diff --git a/WHATS_NEW b/WHATS_NEW
index cddcae3bb167cc511f1fcfdaae2becb378402872..dc5a76a20900126568552ba17b842818572beda4 100644 (file)
--- a/WHATS_NEW
+++ b/WHATS_NEW
@@ -1,5 +1,6 @@
 Version 2.02.57 -
 ====================================
+  Use proper mask for VG lock mode in clvmd.
   Add possibility to drop precommitted metadata in lvmcache.
   Move processing of VG locks to separate function in clvmd.
   Properly decode flags even for VG locks.

diff --git a/daemons/clvmd/clvmd-command.c b/daemons/clvmd/clvmd-command.c
index 1f8d0cfc18bac227115e5108cf7887f6b6ee3ef4..0d9d09f87501360881ffdd73afc3b5cf49c85098 100644 (file)
--- a/daemons/clvmd/clvmd-command.c
+++ b/daemons/clvmd/clvmd-command.c
@@ -193,6 +193,7 @@ static int lock_vg(struct local_client *client)
        (struct clvm_header *) client->bits.localsock.cmd;
     unsigned char lock_cmd;
     unsigned char lock_flags;
+    int lock_mode;
     char *args = header->node + strlen(header->node) + 1;
     int lkid;
     int status = 0;
@@ -212,11 +213,12 @@ static int lock_vg(struct local_client *client)
     }
 
     lock_cmd = args[0] & (LCK_NONBLOCK | LCK_HOLD | LCK_SCOPE_MASK | LCK_TYPE_MASK);
+    lock_mode = ((int)lock_cmd & LCK_TYPE_MASK);
     lock_flags = args[1];
     lockname = &args[2];
     DEBUGLOG("doing PRE command LOCK_VG '%s' at %x (client=%p)\n", lockname, lock_cmd, client);
 
-    if (lock_cmd == LCK_UNLOCK) {
+    if (lock_mode == LCK_UNLOCK) {
 
        lkid = (int)(long)dm_hash_lookup(lock_hash, lockname);
        if (lkid == 0)
@@ -230,11 +232,9 @@ static int lock_vg(struct local_client *client)
     }
     else {
        /* Read locks need to be PR; other modes get passed through */
-       if ((lock_cmd & LCK_TYPE_MASK) == LCK_READ) {
-           lock_cmd &= ~LCK_TYPE_MASK;
-           lock_cmd |= LCK_PREAD;
-       }
-       status = sync_lock(lockname, (int)lock_cmd, (lock_cmd & LCK_NONBLOCK) ? LKF_NOQUEUE : 0, &lkid);
+       if (lock_mode == LCK_READ)
+           lock_mode = LCK_PREAD;
+       status = sync_lock(lockname, lock_mode, (lock_cmd & LCK_NONBLOCK) ? LKF_NOQUEUE : 0, &lkid);
        if (status)
            status = errno;
        else

diff --git a/lib/locking/cluster_locking.c b/lib/locking/cluster_locking.c
index 225795ab9365f45e01ec6bcda109221bc385f324..b82b0778614fc43fe9a0105cbe11d153e745598f 100644 (file)
--- a/lib/locking/cluster_locking.c
+++ b/lib/locking/cluster_locking.c
@@ -409,7 +409,6 @@ int lock_resource(struct cmd_context *cmd, const char *resource, uint32_t flags)
 
                lock_scope = "VG";
                clvmd_cmd = CLVMD_CMD_LOCK_VG;
-               flags &= LCK_TYPE_MASK;
                break;
 
        case LCK_LV: