diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-13 13:08:54 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-13 13:08:54 -0700 |
| commit | 7603ef03a22a33d36d3c75d7c1aca1f957671ad3 (patch) | |
| tree | ff6fb5e582d02612f213deac6d7532d153c6099f /fs/xfs/xfs_vnodeops.h | |
| parent | 1904187a694713b80d74186fe058377b067cc195 (diff) | |
| parent | fd40261354802b0f05f6f67121235aa002e87069 (diff) | |
Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs
* 'for-linus' of git://oss.sgi.com/xfs/xfs: (23 commits)
xfs: fix small mismerge in xfs_vn_mknod
xfs: fix warnings with CONFIG_XFS_QUOTA disabled
xfs: fix freeing memory in xfs_getbmap()
xfs: use generic Posix ACL code
xfs: remove SYNC_BDFLUSH
xfs: remove SYNC_IOWAIT
xfs: split xfs_sync_inodes
xfs: use generic inode iterator in xfs_qm_dqrele_all_inodes
xfs: introduce a per-ag inode iterator
xfs: remove unused parameter from xfs_reclaim_inodes
xfs: factor out inode validation for sync
xfs: split inode flushing from xfs_sync_inodes_ag
xfs: split inode data writeback from xfs_sync_inodes_ag
xfs: kill xfs_qmops
xfs: validate quota log items during log recovery
xfs: update max log size
xfs: prevent deadlock in xfs_qm_shake()
xfs: fix overflow in xfs_growfs_data_private
xfs: fix double unlock in xfs_swap_extents()
xfs: fix getbmap vs mmap deadlock
...
Diffstat (limited to 'fs/xfs/xfs_vnodeops.h')
| -rw-r--r-- | fs/xfs/xfs_vnodeops.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/xfs/xfs_vnodeops.h b/fs/xfs/xfs_vnodeops.h index 04373c6c61f..a9e102de71a 100644 --- a/fs/xfs/xfs_vnodeops.h +++ b/fs/xfs/xfs_vnodeops.h @@ -18,6 +18,7 @@ int xfs_setattr(struct xfs_inode *ip, struct iattr *vap, int flags); #define XFS_ATTR_DMI 0x01 /* invocation from a DMI function */ #define XFS_ATTR_NONBLOCK 0x02 /* return EAGAIN if operation would block */ #define XFS_ATTR_NOLOCK 0x04 /* Don't grab any conflicting locks */ +#define XFS_ATTR_NOACL 0x08 /* Don't call xfs_acl_chmod */ int xfs_readlink(struct xfs_inode *ip, char *link); int xfs_fsync(struct xfs_inode *ip); |