Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 983236b5 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 74aec4e0 a5a7bbcc

fs/xfs/xfs_acl.h

+4 −1
Original line number Diff line number Diff line
@@ -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