From: Linus Torvalds Date: Tue, 26 Jul 2011 05:47:03 +0000 (-0700) Subject: vfs: fix check_acl compile error when CONFIG_FS_POSIX_ACL is not set X-Git-Tag: v3.1-rc1~240 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=84635d68be4b846ba984a89f386524153330c597;p=platform%2Fupstream%2Fkernel-adaptation-pc.git vfs: fix check_acl compile error when CONFIG_FS_POSIX_ACL is not set Commit e77819e57f08 ("vfs: move ACL cache lookup into generic code") didn't take the FS_POSIX_ACL config variable into account - when that is not set, ACL's go away, and the cache helper functions do not exist, causing compile errors like fs/namei.c: In function 'check_acl': fs/namei.c:191:10: error: implicit declaration of function 'negative_cached_acl' fs/namei.c:196:2: error: implicit declaration of function 'get_cached_acl' fs/namei.c:196:6: warning: assignment makes pointer from integer without a cast fs/namei.c:212:11: error: implicit declaration of function 'set_cached_acl' Reported-by: Markus Trippelsdorf Acked-by: Stephen Rothwell Signed-off-by: Linus Torvalds --- diff --git a/fs/namei.c b/fs/namei.c index ef00b98..f8c69d3 100644 --- a/fs/namei.c +++ b/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; }