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
This commit is contained in:
Linus Torvalds 2011-07-29 23:45:06 -07:00
commit 983236b574

View 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_access_handler;
extern const struct xattr_handler xfs_xattr_acl_default_handler; extern const struct xattr_handler xfs_xattr_acl_default_handler;
#else #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_inherit_acl(inode, default_acl) 0
# define xfs_acl_chmod(inode) 0 # define xfs_acl_chmod(inode) 0
# define posix_acl_access_exists(inode) 0 # define posix_acl_access_exists(inode) 0