LU-8150 mdt: Track open+create as mknod

[fs/lustre-release.git] / lustre / mdt / mdt_open.c

diff --git a/lustre/mdt/mdt_open.c b/lustre/mdt/mdt_open.c
index f716949..b305b57 100644 (file)
--- a/lustre/mdt/mdt_open.c
+++ b/lustre/mdt/mdt_open.c
@@ -537,22 +537,17 @@ static int mdt_finish_open(struct mdt_thread_info *info,
                RETURN(-ENOENT);
        }
 
-        if (exp_connect_rmtclient(exp)) {
-                void *buf = req_capsule_server_get(info->mti_pill, &RMF_ACL);
-
-                rc = mdt_pack_remote_perm(info, o, buf);
-                if (rc) {
-                       repbody->mbo_valid &= ~OBD_MD_FLRMTPERM;
-                       repbody->mbo_aclsize = 0;
-               } else {
-                       repbody->mbo_valid |= OBD_MD_FLRMTPERM;
-                       repbody->mbo_aclsize = sizeof(struct mdt_remote_perm);
-                }
-        }
 #ifdef CONFIG_FS_POSIX_ACL
-       else if (exp_connect_flags(exp) & OBD_CONNECT_ACL)
-               rc = mdt_pack_acl2body(info, repbody, o,
-                                      exp->exp_target_data.ted_nodemap);
+       if (exp_connect_flags(exp) & OBD_CONNECT_ACL) {
+               struct lu_nodemap *nodemap = nodemap_get_from_exp(exp);
+               if (IS_ERR(nodemap))
+                       RETURN(PTR_ERR(nodemap));
+
+               rc = mdt_pack_acl2body(info, repbody, o, nodemap);
+               nodemap_putref(nodemap);
+               if (rc)
+                       RETURN(rc);
+       }
 #endif
 
         /*
@@ -1145,7 +1140,7 @@ static int mdt_cross_open(struct mdt_thread_info *info,
                       mdt_obd_name(info->mti_mdt), PFID(fid), -EFAULT);
                LU_OBJECT_DEBUG(D_WARNING, info->mti_env,
                                &o->mot_obj,
-                               "Object isn't on this server! FLD error?\n");
+                               "Object isn't on this server! FLD error?");
                 rc = -EFAULT;
        } else {
                if (mdt_object_exists(o)) {
@@ -1421,7 +1416,8 @@ again:
                         if (result != 0)
                                 GOTO(out_child, result);
                 }
-                created = 1;
+               created = 1;
+               mdt_counter_incr(req, LPROC_MDT_MKNOD);
         } else {
                 /*
                  * The object is on remote node, return its FID for remote open.
@@ -1646,7 +1642,7 @@ static int mdt_hsm_release(struct mdt_thread_info *info, struct mdt_object *o,
        lease_broken = ldlm_is_cancel(lease);
        unlock_res_and_lock(lease);
 
-       LDLM_DEBUG(lease, DFID " lease broken? %d\n",
+       LDLM_DEBUG(lease, DFID " lease broken? %d",
                   PFID(mdt_object_fid(o)), lease_broken);
 
        /* Cancel server side lease. Client side counterpart should
@@ -1769,7 +1765,7 @@ out_close:
                CERROR("%s: error closing volatile file "DFID": rc = %d\n",
                       mdt_obd_name(info->mti_mdt), PFID(&data->cd_fid), rc2);
        LU_OBJECT_DEBUG(D_HSM, info->mti_env, &orphan->mot_obj,
-                       "object closed\n");
+                       "object closed");
        mdt_object_put(info->mti_env, orphan);
 
 out_unlock:
@@ -1864,7 +1860,7 @@ int mdt_close_swap_layouts(struct mdt_thread_info *info,
        lease_broken = ldlm_is_cancel(lease);
        unlock_res_and_lock(lease);
 
-       LDLM_DEBUG(lease, DFID " lease broken? %d\n",
+       LDLM_DEBUG(lease, DFID " lease broken? %d",
                   PFID(mdt_object_fid(o)), lease_broken);
 
        /* Cancel server side lease. Client side counterpart should
@@ -2036,7 +2032,8 @@ int mdt_close_internal(struct mdt_thread_info *info, struct ptlrpc_request *req,
                o = mfd->mfd_object;
                mdt_object_get(info->mti_env, o);
                ret = mdt_mfd_close(info, mfd);
-               rc = mdt_handle_last_unlink(info, o, ma);
+               if (repbody != NULL)
+                       rc = mdt_handle_last_unlink(info, o, ma);
                mdt_object_put(info->mti_env, o);
        }