LU-3259 clio: cl_lock simplification

[fs/lustre-release.git] / lustre / ldlm / ldlm_lock.c

diff --git a/lustre/ldlm/ldlm_lock.c b/lustre/ldlm/ldlm_lock.c
index 6b81e74..7a162e7 100644 (file)
--- a/lustre/ldlm/ldlm_lock.c
+++ b/lustre/ldlm/ldlm_lock.c
@@ -721,7 +721,7 @@ void ldlm_lock_addref(struct lustre_handle *lockh, __u32 mode)
         struct ldlm_lock *lock;
 
         lock = ldlm_handle2lock(lockh);
-        LASSERT(lock != NULL);
+       LASSERTF(lock != NULL, LPX64, lockh->cookie);
         ldlm_lock_addref_internal(lock, mode);
         LDLM_LOCK_PUT(lock);
 }
@@ -1181,10 +1181,11 @@ static struct ldlm_lock *search_queue(struct list_head *queue,
                      lock->l_policy_data.l_extent.end < policy->l_extent.end))
                         continue;
 
-                if (unlikely(match == LCK_GROUP) &&
-                    lock->l_resource->lr_type == LDLM_EXTENT &&
-                    lock->l_policy_data.l_extent.gid != policy->l_extent.gid)
-                        continue;
+               if (unlikely(match == LCK_GROUP) &&
+                   lock->l_resource->lr_type == LDLM_EXTENT &&
+                   policy->l_extent.gid != LDLM_GID_ANY &&
+                   lock->l_policy_data.l_extent.gid != policy->l_extent.gid)
+                       continue;
 
                 /* We match if we have existing lock with same or wider set
                    of bits. */