X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;ds=sidebyside;f=lustre%2Fmdd%2Fmdd_permission.c;h=2b03de13b713c3f6743d2d900bc9c1ce59e7b4a9;hb=refs%2Fchanges%2F92%2F36892%2F13;hp=01b30e1dd21b2c34d21d71618d7c73725807b394;hpb=9c2ffe39bd32f85dab4fbb13855112e57b1dbc5a;p=fs%2Flustre-release.git

diff --git a/lustre/mdd/mdd_permission.c b/lustre/mdd/mdd_permission.c
index 01b30e1..2b03de1 100644
--- a/lustre/mdd/mdd_permission.c
+++ b/lustre/mdd/mdd_permission.c
@@ -45,7 +45,7 @@
 #include <lustre_idmap.h>
 #include "mdd_internal.h"
 
-#ifdef CONFIG_FS_POSIX_ACL
+#ifdef CONFIG_LUSTRE_FS_POSIX_ACL
 
 /*
  * Hold write_lock for o.
@@ -147,7 +147,7 @@ int mdd_acl_set(const struct lu_env *env, struct mdd_object *obj,
 	if (rc)
 		GOTO(stop, rc);
 
-	mdd_write_lock(env, obj, MOR_TGT_CHILD);
+	mdd_write_lock(env, obj, DT_TGT_CHILD);
 	/* whether ACL can be represented by i_mode only */
 	if (not_equiv)
 		rc = mdo_xattr_set(env, obj, buf, XATTR_NAME_ACL_ACCESS, fl,
@@ -207,7 +207,7 @@ int __mdd_fix_mode_acl(const struct lu_env *env, struct lu_buf *buf,
 static int mdd_check_acl(const struct lu_env *env, struct mdd_object *obj,
 			const struct lu_attr *la, int mask)
 {
-#ifdef CONFIG_FS_POSIX_ACL
+#ifdef CONFIG_LUSTRE_FS_POSIX_ACL
 	struct lu_ucred  *uc  = lu_ucred_assert(env);
 	posix_acl_xattr_header *head;
 	posix_acl_xattr_entry *entry;
@@ -342,7 +342,7 @@ int mdd_permission(const struct lu_env *env, struct md_object *pobj,
 
 	rc = mdd_permission_internal_locked(env, mdd_cobj, cattr,
 					    mask & ~MAY_RGETFACL,
-					    MOR_TGT_CHILD);
+					    DT_TGT_CHILD);
 
 	if (unlikely(rc == 0 && (mask & MAY_RGETFACL))) {
 		if (likely(!uc))