---

yaml --- r: 259041 b: refs/heads/master c: 84635d6 h: refs/heads/master i: 259039: c698e0e v: v3
git-mirror · Jul 26, 2011 · 8ff8d48 · 8ff8d48
1 parent f2ab21f
commit 8ff8d48
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 45b583b10a8b438b970e95a7d1d4db22c9e35004
+refs/heads/master: 84635d68be4b846ba984a89f386524153330c597
diff --git a/trunk/fs/namei.c b/trunk/fs/namei.c
@@ -176,6 +176,7 @@ EXPORT_SYMBOL(putname);
 
 static int check_acl(struct inode *inode, int mask)
 {
+#ifdef CONFIG_FS_POSIX_ACL
 	struct posix_acl *acl;
 
 	/*
@@ -219,6 +220,7 @@ static int check_acl(struct inode *inode, int mask)
 	        posix_acl_release(acl);
 	        return error;
 	}
+#endif
 
 	return -EAGAIN;
 }