diff options
| author | Dave Chinner <david@fromorbit.com> | 2014-05-15 09:36:59 +1000 |
|---|---|---|
| committer | Dave Chinner <david@fromorbit.com> | 2014-05-15 09:36:59 +1000 |
| commit | 232c2f5c65dd80055e7163a5c82e3816119330e6 (patch) | |
| tree | e103eaf14b6c9d4b24f9a33a0d3d218b3a76bbac /fs/xfs/xfs_inode.h | |
| parent | fdd3a2ae2e48310491e605c46201c95629dd450b (diff) | |
| parent | b94acd4786dce4379e986e6d58bdd74f8986af2f (diff) | |
| download | linux-232c2f5c65dd80055e7163a5c82e3816119330e6.tar.gz linux-232c2f5c65dd80055e7163a5c82e3816119330e6.tar.bz2 linux-232c2f5c65dd80055e7163a5c82e3816119330e6.zip | |
Merge branch 'xfs-filestreams-lookup' into for-next
Diffstat (limited to 'fs/xfs/xfs_inode.h')
| -rw-r--r-- | fs/xfs/xfs_inode.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/fs/xfs/xfs_inode.h b/fs/xfs/xfs_inode.h index f2fcde52b66d..13aea548206c 100644 --- a/fs/xfs/xfs_inode.h +++ b/fs/xfs/xfs_inode.h @@ -209,7 +209,6 @@ xfs_get_initial_prid(struct xfs_inode *dp) #define XFS_ISTALE (1 << 1) /* inode has been staled */ #define XFS_IRECLAIMABLE (1 << 2) /* inode can be reclaimed */ #define XFS_INEW (1 << 3) /* inode has just been allocated */ -#define XFS_IFILESTREAM (1 << 4) /* inode is in a filestream dir. */ #define XFS_ITRUNCATED (1 << 5) /* truncated down so flush-on-close */ #define XFS_IDIRTY_RELEASE (1 << 6) /* dirty release already seen */ #define __XFS_IFLOCK_BIT 7 /* inode is being flushed right now */ @@ -225,8 +224,7 @@ xfs_get_initial_prid(struct xfs_inode *dp) */ #define XFS_IRECLAIM_RESET_FLAGS \ (XFS_IRECLAIMABLE | XFS_IRECLAIM | \ - XFS_IDIRTY_RELEASE | XFS_ITRUNCATED | \ - XFS_IFILESTREAM); + XFS_IDIRTY_RELEASE | XFS_ITRUNCATED) /* * Synchronize processes attempting to flush the in-core inode back to disk. |