Branch b_release_1_4_6

oops

diff --git a/lustre/ldlm/ldlm_lock.c b/lustre/ldlm/ldlm_lock.c
index e58bd85..16ea94e 100644 (file)
--- a/lustre/ldlm/ldlm_lock.c
+++ b/lustre/ldlm/ldlm_lock.c
@@ -763,18 +763,18 @@ int ldlm_lock_match(struct ldlm_namespace *ns, int flags,
         if (rc) {
                 l_lock(&ns->ns_lock);
                 LDLM_DEBUG(lock, "matched ("LPU64" "LPU64")",
-                           (type == LDLM_PLAIN || type = LDLM_IBITS) ?
+                           (type == LDLM_PLAIN || type == LDLM_IBITS) ?
                                 res_id->name[2] : policy->l_extent.start,
-                           (type == LDLM_PLAIN || type = LDLM_IBITS) ?
+                           (type == LDLM_PLAIN || type == LDLM_IBITS) ?
                                 res_id->name[3] : policy->l_extent.end);
                 l_unlock(&ns->ns_lock);
         } else if (!(flags & LDLM_FL_TEST_LOCK)) {/*less verbose for test-only*/
                 LDLM_DEBUG_NOLOCK("not matched ns %p type %u mode %u res "
                                   LPU64"/"LPU64" ("LPU64" "LPU64")", ns,
                                   type, mode, res_id->name[0], res_id->name[1],
-                                  (type == LDLM_PLAIN || type = LDLM_IBITS) ?
+                                  (type == LDLM_PLAIN || type == LDLM_IBITS) ?
                                         res_id->name[2] :policy->l_extent.start,
-                                (type == LDLM_PLAIN || type = LDLM_IBITS) ?
+                                (type == LDLM_PLAIN || type == LDLM_IBITS) ?
                                         res_id->name[3] : policy->l_extent.end);
         }
         if (old_lock)

diff --git a/lustre/mdc/mdc_locks.c b/lustre/mdc/mdc_locks.c
index a265ce0..9c073cd 100644 (file)
--- a/lustre/mdc/mdc_locks.c
+++ b/lustre/mdc/mdc_locks.c
@@ -256,7 +256,7 @@ int mdc_enqueue(struct obd_export *exp,
         int rc, flags = extra_lock_flags | LDLM_FL_HAS_INTENT;
         ENTRY;
 
-        LASSERTF(lock_type == LDLM_IBITS
+        LASSERTF(lock_type == LDLM_IBITS, "lock type %d\n", lock_type);
 //        LDLM_DEBUG_NOLOCK("mdsintent=%s,name=%s,dir=%lu",
 //                          ldlm_it2str(it->it_op), it_name, it_inode->i_ino);