diff options
| author | Steve French <sfrench@us.ibm.com> | 2009-06-14 09:34:46 -0400 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2009-06-14 09:34:46 -0400 |
| commit | b70b92e41d95fd906f05f6e98f61209201495fa7 (patch) | |
| tree | 594890f30f1d89d54eccfd2780dfc033bd2fdd06 /fs/xfs/xfs_vnodeops.h | |
| parent | 1e68b2b2756fc3488ecbade5ad5f13302b3aaafc (diff) | |
| parent | 44b7532b8b464f606053562400719c9c21276037 (diff) | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
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 04373c6c61ff..a9e102de71a1 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); | |||
| 18 | #define XFS_ATTR_DMI 0x01 /* invocation from a DMI function */ | 18 | #define XFS_ATTR_DMI 0x01 /* invocation from a DMI function */ |
| 19 | #define XFS_ATTR_NONBLOCK 0x02 /* return EAGAIN if operation would block */ | 19 | #define XFS_ATTR_NONBLOCK 0x02 /* return EAGAIN if operation would block */ |
| 20 | #define XFS_ATTR_NOLOCK 0x04 /* Don't grab any conflicting locks */ | 20 | #define XFS_ATTR_NOLOCK 0x04 /* Don't grab any conflicting locks */ |
| 21 | #define XFS_ATTR_NOACL 0x08 /* Don't call xfs_acl_chmod */ | ||
| 21 | 22 | ||
| 22 | int xfs_readlink(struct xfs_inode *ip, char *link); | 23 | int xfs_readlink(struct xfs_inode *ip, char *link); |
| 23 | int xfs_fsync(struct xfs_inode *ip); | 24 | int xfs_fsync(struct xfs_inode *ip); |