Skip to content

Commit 206d440

Browse files
Markus TrippelsdorfAl Viro
Markus Trippelsdorf
authored and
Al Viro
committed
xfs: Fix build breakage in xfs_iops.c when CONFIG_FS_POSIX_ACL is not set
commit 4e34e71, 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 <[email protected]> Signed-off-by: Al Viro <[email protected]>
1 parent 43c1c9c commit 206d440

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

fs/xfs/xfs_acl.h

+4-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,10 @@ extern int posix_acl_default_exists(struct inode *inode);
5151
extern const struct xattr_handler xfs_xattr_acl_access_handler;
5252
extern const struct xattr_handler xfs_xattr_acl_default_handler;
5353
#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+
}
5558
# define xfs_inherit_acl(inode, default_acl) 0
5659
# define xfs_acl_chmod(inode) 0
5760
# define posix_acl_access_exists(inode) 0

0 commit comments

Comments
 (0)