xfs: Fix build breakage in xfs_iops.c when CONFIG_FS_POSIX_ACL is not set
authorMarkus Trippelsdorf <markus@trippelsdorf.de>
Tue, 26 Jul 2011 09:15:20 +0000 (11:15 +0200)
committerAlex Elder <aelder@sgi.com>
Fri, 29 Jul 2011 17:26:14 +0000 (12:26 -0500)
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: Alex Elder <aelder@sgi.com>
fs/xfs/xfs_acl.h

index 2c656ef49473b0f429d15861dfde1e1c6eb0b292..39632d94135490ac94dee48ff5f037d29d5592ac 100644 (file)
@@ -51,7 +51,10 @@ extern int posix_acl_default_exists(struct inode *inode);
 extern const struct xattr_handler xfs_xattr_acl_access_handler;
 extern const struct xattr_handler xfs_xattr_acl_default_handler;
 #else
-# define xfs_get_acl(inode, type)                      NULL
+static inline struct posix_acl *xfs_get_acl(struct inode *inode, int type)
+{
+       return NULL;
+}
 # define xfs_inherit_acl(inode, default_acl)           0
 # define xfs_acl_chmod(inode)                          0
 # define posix_acl_access_exists(inode)                        0