JBD2_HAS_COMPAT_FEATURE was used instead of JBD2_HAS_INCOMPAT_FEATURE for

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

diff --git a/lustre/mdt/mdt_open.c b/lustre/mdt/mdt_open.c
index 0507d97..ed74be0 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;
@@ -605,8 +604,8 @@ 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)) {
-                obd_fail_loc = OBD_FAIL_LDLM_REPLY | OBD_FAIL_ONCE;
+        if (OBD_FAIL_CHECK_RESET(OBD_FAIL_MDS_OPEN_CREATE,
+                                 OBD_FAIL_LDLM_REPLY | OBD_FAIL_ONCE)) {
                 RETURN(-EAGAIN);
         }
 
@@ -746,7 +745,6 @@ static int mdt_open_by_fid(struct mdt_thread_info* info,
         int                      rc;
         ENTRY;
 
-        LASSERT(info->mti_spec.u.sp_ea.no_lov_create);
         o = mdt_object_find(info->mti_env, info->mti_mdt, rr->rr_fid2);
         if (IS_ERR(o))
                 RETURN(rc = PTR_ERR(o));
@@ -759,7 +757,7 @@ static int mdt_open_by_fid(struct mdt_thread_info* info,
 
                 rc = mo_attr_get(env, mdt_object_child(o), ma);
                 if (rc == 0)
-                        rc = mdt_mfd_open(info, NULL, o, flags, 0);
+                        rc = mdt_finish_open(info, NULL, o, flags, 0, rep);
         } else if (rc == 0) {
                 rc = -ENOENT;
         } else  {
@@ -847,8 +845,8 @@ int mdt_reint_open(struct mdt_thread_info *info, struct mdt_lock_handle *lhc)
         int                      created = 0;
         ENTRY;
 
-        OBD_FAIL_TIMEOUT(OBD_FAIL_MDS_PAUSE_OPEN | OBD_FAIL_ONCE,
-                         (obd_timeout + 1) / 4);
+        OBD_FAIL_TIMEOUT_ORSET(OBD_FAIL_MDS_PAUSE_OPEN, OBD_FAIL_ONCE,
+                               (obd_timeout + 1) / 4);
 
         repbody = req_capsule_server_get(&info->mti_pill, &RMF_MDT_BODY);
 
@@ -873,13 +871,17 @@ int mdt_reint_open(struct mdt_thread_info *info, struct mdt_lock_handle *lhc)
                PFID(rr->rr_fid2), create_flags,
                ma->ma_attr.la_mode, lustre_msg_get_flags(req->rq_reqmsg));
 
-        if (lustre_msg_get_flags(req->rq_reqmsg) & MSG_REPLAY) {
-                /* This is a replay request. */
+        if ((lustre_msg_get_flags(req->rq_reqmsg) & MSG_REPLAY) ||
+            (req->rq_export->exp_libclient && create_flags&MDS_OPEN_HAS_EA)) {
+                /* This is a replay request or from liblustre with ea. */
                 result = mdt_open_by_fid(info, ldlm_rep);
 
-                if (result != -ENOENT)
+                if (result != -ENOENT) {
+                        if (req->rq_export->exp_libclient &&
+                            create_flags&MDS_OPEN_HAS_EA)
+                                GOTO(out, result = 0);
                         GOTO(out, result);
-
+                }
                 /*
                  * We didn't find the correct object, so we need to re-create it
                  * via a regular replay.
@@ -892,7 +894,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,
@@ -1214,7 +1216,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);