X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fmdd%2Fmdd_permission.c;h=01b30e1dd21b2c34d21d71618d7c73725807b394;hb=1db90b29ad676c2cf1888ef5a7c623161ff23bf9;hp=0065a61d87e1c0574c7d9f1cac78a667387e0f95;hpb=9189dbcd10bced3e2acb12b4393f5d3e849a9649;p=fs%2Flustre-release.git

diff --git a/lustre/mdd/mdd_permission.c b/lustre/mdd/mdd_permission.c
index 0065a61..01b30e1 100644
--- a/lustre/mdd/mdd_permission.c
+++ b/lustre/mdd/mdd_permission.c
@@ -315,9 +315,8 @@ check_capabilities:
 	RETURN(-EACCES);
 }
 
-int mdd_permission(const struct lu_env *env,
-                   struct md_object *pobj, struct md_object *cobj,
-                   struct md_attr *ma, int mask)
+int mdd_permission(const struct lu_env *env, struct md_object *pobj,
+		   struct md_object *cobj, struct md_attr *ma, int mask)
 {
 	struct mdd_object *mdd_pobj = NULL;
 	struct mdd_object *mdd_cobj;
@@ -341,12 +340,6 @@ int mdd_permission(const struct lu_env *env,
 	if (rc)
 		RETURN(rc);
 
-	/* For cross_open case, the "mask" is open flags,
-	 * so convert it to permission mask first.
-	 * XXX: MDS_OPEN_CROSS must be NOT equal to permission mask MAY_*. */
-	if (unlikely(mask & MDS_OPEN_CROSS))
-		mask = accmode(env, cattr, mask & ~MDS_OPEN_CROSS);
-
 	rc = mdd_permission_internal_locked(env, mdd_cobj, cattr,
 					    mask & ~MAY_RGETFACL,
 					    MOR_TGT_CHILD);