diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-29 23:45:06 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-29 23:45:06 -0700 |
| commit | 983236b5741e557451f3ed4ec5ebf1f62a5b2c15 (patch) | |
| tree | 2b9872f659ac73df93fdaeca4d37654a5a84d4fc | |
| parent | 74aec4e0dd93d4202d3d5a692723f39cc5332b15 (diff) | |
| parent | a5a7bbcc0137e5cdad21cce0962f6be0b7ecf173 (diff) | |
| download | blackbird-op-linux-983236b5741e557451f3ed4ec5ebf1f62a5b2c15.tar.gz blackbird-op-linux-983236b5741e557451f3ed4ec5ebf1f62a5b2c15.zip | |
Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs
* 'for-linus' of git://oss.sgi.com/xfs/xfs:
xfs: Fix build breakage in xfs_iops.c when CONFIG_FS_POSIX_ACL is not set
| -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 |
