diff options
author | Markus Trippelsdorf <markus@trippelsdorf.de> | 2011-07-26 05:15:20 -0400 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2011-08-01 02:35:04 -0400 |
commit | 206d440f64030b6425841bf7cb38e26a5ea0c382 (patch) | |
tree | 59be5f26a3b7ae922927c5d78082a37cdc5bb511 | |
parent | 43c1c9cd244098012441b90c32304f11f1258d43 (diff) |
xfs: Fix build breakage in xfs_iops.c when CONFIG_FS_POSIX_ACL is not set
commit 4e34e719e45, that takes the ACL checks to common code,
accidentely broke the build when CONFIG_FS_POSIX_ACL is not set:
CC fs/xfs/linux-2.6/xfs_iops.o
fs/xfs/linux-2.6/xfs_iops.c:1025:14: error: ‘xfs_get_acl’ undeclared here (not in a function)
Fix this by declaring xfs_get_acl a static inline function.
Signed-off-by: Markus Trippelsdorf <markus@trippelsdorf.de>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
-rw-r--r-- | fs/xfs/xfs_acl.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/fs/xfs/xfs_acl.h b/fs/xfs/xfs_acl.h index 2c656ef49473..39632d941354 100644 --- a/fs/xfs/xfs_acl.h +++ b/fs/xfs/xfs_acl.h | |||
@@ -51,7 +51,10 @@ extern int posix_acl_default_exists(struct inode *inode); | |||
51 | extern const struct xattr_handler xfs_xattr_acl_access_handler; | 51 | extern const struct xattr_handler xfs_xattr_acl_access_handler; |
52 | extern const struct xattr_handler xfs_xattr_acl_default_handler; | 52 | extern const struct xattr_handler xfs_xattr_acl_default_handler; |
53 | #else | 53 | #else |
54 | # define xfs_get_acl(inode, type) NULL | 54 | static inline struct posix_acl *xfs_get_acl(struct inode *inode, int type) |
55 | { | ||
56 | return NULL; | ||
57 | } | ||
55 | # define xfs_inherit_acl(inode, default_acl) 0 | 58 | # define xfs_inherit_acl(inode, default_acl) 0 |
56 | # define xfs_acl_chmod(inode) 0 | 59 | # define xfs_acl_chmod(inode) 0 |
57 | # define posix_acl_access_exists(inode) 0 | 60 | # define posix_acl_access_exists(inode) 0 |