LU-2901 ldlm: fix resource/fid check, use DLDLMRES

[fs/lustre-release.git] / lustre / mdc / mdc_locks.c

diff --git a/lustre/mdc/mdc_locks.c b/lustre/mdc/mdc_locks.c
index cc60d2e..d6e155a 100644 (file)
--- a/lustre/mdc/mdc_locks.c
+++ b/lustre/mdc/mdc_locks.c
@@ -79,6 +79,12 @@ EXPORT_SYMBOL(it_clear_disposition);
 
 int it_open_error(int phase, struct lookup_intent *it)
 {
+       if (it_disposition(it, DISP_OPEN_LEASE)) {
+               if (phase >= DISP_OPEN_LEASE)
+                       return it->d.lustre.it_status;
+               else
+                       return 0;
+       }
         if (it_disposition(it, DISP_OPEN_OPEN)) {
                 if (phase >= DISP_OPEN_OPEN)
                         return it->d.lustre.it_status;
@@ -293,19 +299,26 @@ static struct ptlrpc_request *mdc_intent_open_pack(struct obd_export *exp,
 
         /* XXX: openlock is not cancelled for cross-refs. */
         /* If inode is known, cancel conflicting OPEN locks. */
-        if (fid_is_sane(&op_data->op_fid2)) {
-                if (it->it_flags & (FMODE_WRITE|MDS_OPEN_TRUNC))
-                        mode = LCK_CW;
+       if (fid_is_sane(&op_data->op_fid2)) {
+               if (it->it_flags & MDS_OPEN_LEASE) { /* try to get lease */
+                       if (it->it_flags & FMODE_WRITE)
+                               mode = LCK_EX;
+                       else
+                               mode = LCK_PR;
+               } else {
+                       if (it->it_flags & (FMODE_WRITE|MDS_OPEN_TRUNC))
+                               mode = LCK_CW;
 #ifdef FMODE_EXEC
-                else if (it->it_flags & FMODE_EXEC)
-                        mode = LCK_PR;
+                       else if (it->it_flags & FMODE_EXEC)
+                               mode = LCK_PR;
 #endif
-                else
-                        mode = LCK_CR;
-                count = mdc_resource_get_unused(exp, &op_data->op_fid2,
-                                                &cancels, mode,
-                                                MDS_INODELOCK_OPEN);
-        }
+                       else
+                               mode = LCK_CR;
+               }
+               count = mdc_resource_get_unused(exp, &op_data->op_fid2,
+                                               &cancels, mode,
+                                               MDS_INODELOCK_OPEN);
+       }
 
         /* If CREATE, cancel parent's UPDATE lock. */
         if (it->it_op & IT_CREAT)
@@ -976,16 +989,11 @@ static int mdc_finish_intent_lock(struct obd_export *exp,
                 ldlm_policy_data_t policy = lock->l_policy_data;
                 LDLM_DEBUG(lock, "matching against this");
 
-                LASSERTF(fid_res_name_eq(&mdt_body->fid1,
-                                         &lock->l_resource->lr_name),
-                         "Lock res_id: %lu/%lu/%lu, fid: %lu/%lu/%lu.\n",
-                         (unsigned long)lock->l_resource->lr_name.name[0],
-                         (unsigned long)lock->l_resource->lr_name.name[1],
-                         (unsigned long)lock->l_resource->lr_name.name[2],
-                         (unsigned long)fid_seq(&mdt_body->fid1),
-                         (unsigned long)fid_oid(&mdt_body->fid1),
-                         (unsigned long)fid_ver(&mdt_body->fid1));
-                LDLM_LOCK_PUT(lock);
+               LASSERTF(fid_res_name_eq(&mdt_body->fid1,
+                                        &lock->l_resource->lr_name),
+                        "Lock res_id: "DLDLMRES", fid: "DFID"\n",
+                        PLDLMRES(lock->l_resource), PFID(&mdt_body->fid1));
+               LDLM_LOCK_PUT(lock);
 
                 memcpy(&old_lock, lockh, sizeof(*lockh));
                 if (ldlm_lock_match(NULL, LDLM_FL_BLOCK_GRANTED, NULL,
@@ -1080,16 +1088,16 @@ int mdc_intent_lock(struct obd_export *exp, struct md_op_data *op_data,
                     ldlm_blocking_callback cb_blocking,
                    __u64 extra_lock_flags)
 {
-        struct lustre_handle lockh;
-        int rc = 0;
-        ENTRY;
-        LASSERT(it);
+       struct lustre_handle lockh;
+       int rc = 0;
+       ENTRY;
+       LASSERT(it);
 
-        CDEBUG(D_DLMTRACE, "(name: %.*s,"DFID") in obj "DFID
-               ", intent: %s flags %#o\n", op_data->op_namelen,
-               op_data->op_name, PFID(&op_data->op_fid2),
-               PFID(&op_data->op_fid1), ldlm_it2str(it->it_op),
-               it->it_flags);
+       CDEBUG(D_DLMTRACE, "(name: %.*s,"DFID") in obj "DFID
+               ", intent: %s flags %#Lo\n", op_data->op_namelen,
+               op_data->op_name, PFID(&op_data->op_fid2),
+               PFID(&op_data->op_fid1), ldlm_it2str(it->it_op),
+               it->it_flags);
 
         lockh.cookie = 0;
         if (fid_is_sane(&op_data->op_fid2) &&
@@ -1216,11 +1224,11 @@ int mdc_intent_getattr_async(struct obd_export *exp,
                                  };
         int                      rc = 0;
        __u64                    flags = LDLM_FL_HAS_INTENT;
-        ENTRY;
+       ENTRY;
 
-        CDEBUG(D_DLMTRACE,"name: %.*s in inode "DFID", intent: %s flags %#o\n",
-               op_data->op_namelen, op_data->op_name, PFID(&op_data->op_fid1),
-               ldlm_it2str(it->it_op), it->it_flags);
+       CDEBUG(D_DLMTRACE,"name: %.*s in inode "DFID", intent: %s flags %#Lo\n",
+               op_data->op_namelen, op_data->op_name, PFID(&op_data->op_fid1),
+               ldlm_it2str(it->it_op), it->it_flags);
 
         fid_build_reg_res_name(&op_data->op_fid1, &res_id);
         req = mdc_intent_getattr_pack(exp, it, op_data);