- fixed inverted condition, committed missed bits from cobd

diff --git a/lustre/cobd/cache_obd.c b/lustre/cobd/cache_obd.c
index 4e20a07..f5831dd 100644 (file)
--- a/lustre/cobd/cache_obd.c
+++ b/lustre/cobd/cache_obd.c
@@ -1273,7 +1273,9 @@ static int cobd_md_intent_lock(struct obd_export *exp, struct lustre_id *pid,
                        exp->exp_handle.h_cookie);
                 return -EINVAL;
         }
+        lookup_flags |= LOOKUP_COBD;
         cobd_exp = cobd_get_exp(obd);
+        
         return md_intent_lock(cobd_exp, pid, name, len, lmm, lmmsize,
                               cid, it, lookup_flags, reqp, cb_blocking);
 }

diff --git a/lustre/mdc/mdc_locks.c b/lustre/mdc/mdc_locks.c
index 75121b1..f0987fc 100644 (file)
--- a/lustre/mdc/mdc_locks.c
+++ b/lustre/mdc/mdc_locks.c
@@ -602,7 +602,7 @@ int mdc_intent_lock(struct obd_export *exp, struct lustre_id *pid,
                 
                 /* we have to compare all the fields but type, because MDS can
                  * return fid/mds/ino/gen if inode lives on another MDS -bzzz */
-                if ((lookup_flags & LOOKUP_COBD) && !id_equal(cid, &mds_body->id1))
+                if (!(lookup_flags & LOOKUP_COBD) && !id_equal(cid, &mds_body->id1))
                         RETURN(-ESTALE);
         }