From 8ff8d48c424b62b772aa13f6e2933949b1e722ef Mon Sep 17 00:00:00 2001
From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 25 Jul 2011 22:47:03 -0700
Subject: [PATCH] --- yaml --- r: 259041 b: refs/heads/master c:
 84635d68be4b846ba984a89f386524153330c597 h: refs/heads/master i:   259039:
 c698e0ea1aad331720e38ec012647ffaebe2fd20 v: v3

---
 [refs]           | 2 +-
 trunk/fs/namei.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 89b5e6290cd8..efd7b57bfe36 100644
--- 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
index ef00b984fb20..f8c69d373793 100644
--- 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;
 }