- replace MDT_FAIL_* with OBD_FAIL_*

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

diff --git a/lustre/mdt/mdt_open.c b/lustre/mdt/mdt_open.c
index fe4b6f3..f5f6b8e 100644 (file)
--- a/lustre/mdt/mdt_open.c
+++ b/lustre/mdt/mdt_open.c
@@ -98,8 +98,7 @@ static int mdt_create_data(struct mdt_thread_info *info,
         int rc;
         ENTRY;
 
-        if ((spec->sp_cr_flags & MDS_OPEN_DELAY_CREATE) ||
-            !(spec->sp_cr_flags & FMODE_WRITE))
+        if (!md_should_create(spec->sp_cr_flags))
                 RETURN(0);
 
         ma->ma_need = MA_INODE | MA_LOV;
@@ -566,12 +565,11 @@ static int mdt_finish_open(struct mdt_thread_info *info,
         if (mdt->mdt_opts.mo_oss_capa &&
             S_ISREG(lu_object_attr(&o->mot_obj.mo_lu))) {
                 struct lustre_capa *capa;
-                struct md_ucred *ucred = mdt_ucred(info);
 
                 capa = req_capsule_server_get(&info->mti_pill, &RMF_CAPA2);
                 LASSERT(capa);
                 capa->lc_opc = CAPA_OPC_OSS_DEFAULT | capa_open_opc(flags);
-                capa->lc_uid = ucred->mu_o_fsuid;
+                capa->lc_uid = 0;
                 rc = mo_capa_get(info->mti_env, mdt_object_child(o), capa, 0);
                 if (rc)
                         RETURN(rc);
@@ -606,7 +604,7 @@ static int mdt_finish_open(struct mdt_thread_info *info,
         } else if (flags & MDS_OPEN_DIRECTORY)
                 RETURN(-ENOTDIR);
 
-        if (MDT_FAIL_CHECK(OBD_FAIL_MDS_OPEN_CREATE)) {
+        if (OBD_FAIL_CHECK(OBD_FAIL_MDS_OPEN_CREATE)) {
                 obd_fail_loc = OBD_FAIL_LDLM_REPLY | OBD_FAIL_ONCE;
                 RETURN(-EAGAIN);
         }
@@ -893,7 +891,7 @@ int mdt_reint_open(struct mdt_thread_info *info, struct mdt_lock_handle *lhc)
                        "regular open\n");
         }
 
-        if (MDT_FAIL_CHECK(OBD_FAIL_MDS_OPEN_PACK))
+        if (OBD_FAIL_CHECK(OBD_FAIL_MDS_OPEN_PACK))
                 GOTO(out, result = err_serious(-ENOMEM));
 
         mdt_set_disposition(info, ldlm_rep,
@@ -1150,6 +1148,7 @@ int mdt_close(struct mdt_thread_info *info)
         struct mdt_object      *o;
         struct md_attr         *ma = &info->mti_attr;
         struct mdt_body        *repbody = NULL;
+        struct ptlrpc_request  *req = mdt_info_req(info);
         int rc, ret = 0;
         ENTRY;
 
@@ -1165,6 +1164,9 @@ int mdt_close(struct mdt_thread_info *info)
         req_capsule_set_size(&info->mti_pill, &RMF_LOGCOOKIES, RCL_SERVER,
                              info->mti_mdt->mdt_max_cookiesize);
         rc = req_capsule_pack(&info->mti_pill);
+        if (mdt_check_resent(info, mdt_reconstruct_generic, NULL))
+                RETURN(lustre_msg_get_status(req->rq_repmsg));
+
         /* Continue to close handle even if we can not pack reply */
         if (rc == 0) {
                 repbody = req_capsule_server_get(&info->mti_pill,
@@ -1185,7 +1187,7 @@ int mdt_close(struct mdt_thread_info *info)
         } else
                 rc = err_serious(rc);
 
-        med = &mdt_info_req(info)->rq_export->exp_mdt_data;
+        med = &req->rq_export->exp_mdt_data;
         spin_lock(&med->med_open_lock);
         mfd = mdt_handle2mfd(info, &info->mti_epoch->handle);
         if (mdt_mfd_closed(mfd)) {
@@ -1211,7 +1213,7 @@ int mdt_close(struct mdt_thread_info *info)
         if (repbody != NULL)
                 mdt_shrink_reply(info);
 
-        if (MDT_FAIL_CHECK(OBD_FAIL_MDS_CLOSE_PACK))
+        if (OBD_FAIL_CHECK(OBD_FAIL_MDS_CLOSE_PACK))
                 RETURN(err_serious(-ENOMEM));
 
         RETURN(rc ? rc : ret);
@@ -1220,7 +1222,6 @@ int mdt_close(struct mdt_thread_info *info)
 int mdt_done_writing(struct mdt_thread_info *info)
 {
         struct mdt_body         *repbody = NULL;
-        struct ptlrpc_request   *req = mdt_info_req(info);
         struct mdt_export_data  *med;
         struct mdt_file_data    *mfd;
         int rc;
@@ -1240,6 +1241,9 @@ int mdt_done_writing(struct mdt_thread_info *info)
         if (rc)
                 RETURN(err_serious(rc));
 
+        if (mdt_check_resent(info, mdt_reconstruct_generic, NULL))
+                RETURN(lustre_msg_get_status(mdt_info_req(info)->rq_repmsg));
+
         med = &info->mti_exp->exp_mdt_data;
         spin_lock(&med->med_open_lock);
         mfd = mdt_handle2mfd(info, &info->mti_epoch->handle);
@@ -1251,17 +1255,8 @@ int mdt_done_writing(struct mdt_thread_info *info)
                 RETURN(-ESTALE);
         } 
  
-        if (!(mfd->mfd_mode == FMODE_EPOCH ||
-             mfd->mfd_mode == FMODE_EPOCHLCK)) {
-                spin_unlock(&med->med_open_lock);
-                DEBUG_REQ(D_WARNING, req, "req should be resent req");
-                LASSERT(mfd->mfd_mode == FMODE_SOM);
-                LASSERT(lustre_msg_get_flags(req->rq_reqmsg) & 
-                        (MSG_RESENT | MSG_REPLAY));
-                /*Since we did not bond this req with open/close,
-                 *Why we should keep this req as replay req XXX*/
-                GOTO(empty_transno, rc);
-        }
+        LASSERT(mfd->mfd_mode == FMODE_EPOCH ||
+                mfd->mfd_mode == FMODE_EPOCHLCK);
         class_handle_unhash(&mfd->mfd_handle);
         list_del_init(&mfd->mfd_list);
         spin_unlock(&med->med_open_lock);
@@ -1270,7 +1265,6 @@ int mdt_done_writing(struct mdt_thread_info *info)
         info->mti_epoch->flags |= MF_EPOCH_CLOSE;
         info->mti_attr.ma_valid = 0;
         rc = mdt_mfd_close(info, mfd);
-empty_transno:
         mdt_empty_transno(info);
         RETURN(rc);
 }