aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/posix_acl.h
diff options
context:
space:
mode:
authorMarkus Trippelsdorf <markus@trippelsdorf.de>2009-06-24 22:28:52 +0200
committerAl Viro <viro@zeniv.linux.org.uk>2009-06-24 16:34:50 -0400
commit641cf4a668e9e69d2bc061e953422ff72a91f86e (patch)
tree77f34986228430a13d5b2a64e52c0b681b02bf70 /include/linux/posix_acl.h
parentMerge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus (diff)
downloadlinux-dev-641cf4a668e9e69d2bc061e953422ff72a91f86e.tar.xz
linux-dev-641cf4a668e9e69d2bc061e953422ff72a91f86e.zip
inline functions left without protection of ifdef (acl)
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'include/linux/posix_acl.h')
-rw-r--r--include/linux/posix_acl.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/posix_acl.h b/include/linux/posix_acl.h
index 0cdba01b7756..c513466c7dc7 100644
--- a/include/linux/posix_acl.h
+++ b/include/linux/posix_acl.h
@@ -83,6 +83,7 @@ extern int posix_acl_chmod_masq(struct posix_acl *, mode_t);
extern struct posix_acl *get_posix_acl(struct inode *, int);
extern int set_posix_acl(struct inode *, int, struct posix_acl *);
+#ifdef CONFIG_FS_POSIX_ACL
static inline struct posix_acl *get_cached_acl(struct inode *inode, int type)
{
struct posix_acl **p, *acl;
@@ -146,5 +147,5 @@ static inline void forget_cached_acl(struct inode *inode, int type)
if (old != ACL_NOT_CACHED)
posix_acl_release(old);
}
-
+#endif
#endif /* __LINUX_POSIX_ACL_H */