diff options
| author | Markus Trippelsdorf <markus@trippelsdorf.de> | 2011-07-26 11:15:20 +0200 |
|---|---|---|
| committer | Alex Elder <aelder@sgi.com> | 2011-07-29 12:26:14 -0500 |
| commit | a5a7bbcc0137e5cdad21cce0962f6be0b7ecf173 (patch) | |
| tree | b0b9324b536da4c59390e58b5003f06829c718df | |
| parent | 55f9c40ff632d03c527d6a6ceddcda0a224587a6 (diff) | |
| download | lwn-a5a7bbcc0137e5cdad21cce0962f6be0b7ecf173.tar.gz lwn-a5a7bbcc0137e5cdad21cce0962f6be0b7ecf173.zip | |
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: Alex Elder <aelder@sgi.com>
| -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); 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 |