LU-3181 mdt: mdt_cross_open should allow open by FID on MDT1

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

diff --git a/lustre/mdt/mdt_open.c b/lustre/mdt/mdt_open.c
index e25e4fd..62e2aa2 100644 (file)
--- a/lustre/mdt/mdt_open.c
+++ b/lustre/mdt/mdt_open.c
@@ -1461,9 +1461,9 @@ int mdt_open_by_fid_lock(struct mdt_thread_info *info, struct ldlm_reply *rep,
                         ma->ma_need |= MA_PFID;
         }
 
-        o = mdt_object_find(env, mdt, rr->rr_fid2);
-        if (IS_ERR(o))
-                RETURN(rc = PTR_ERR(o));
+       o = mdt_object_find(env, mdt, rr->rr_fid2);
+       if (IS_ERR(o))
+               GOTO(out_parent_put, rc = PTR_ERR(o));
 
        if (mdt_object_remote(o)) {
                CDEBUG(D_INFO, "%s: "DFID" is on remote MDT.\n",
@@ -1526,6 +1526,7 @@ out_unlock:
        mdt_object_open_unlock(info, o, lhc, ibits, rc);
 out:
        mdt_object_put(env, o);
+out_parent_put:
        if (parent != NULL)
                mdt_object_put(env, parent);
        return rc;
@@ -1569,13 +1570,6 @@ static int mdt_cross_open(struct mdt_thread_info *info,
                        if (rc != 0)
                                GOTO(out, rc);
 
-                       /* Do not create lov object if the fid is opened
-                        * under OBF */
-                       if (S_ISREG(ma->ma_attr.la_mode) &&
-                           !(ma->ma_valid & MA_LOV) && (flags & FMODE_WRITE) &&
-                           fid_is_obf(parent_fid))
-                               GOTO(out, rc = -EPERM);
-
                        rc = mdt_finish_open(info, NULL, o, flags, 0, rep);
                } else {
                        /*