diff options
author | Dave Chinner <dchinner@redhat.com> | 2014-08-03 23:23:15 -0400 |
---|---|---|
committer | Dave Chinner <david@fromorbit.com> | 2014-08-03 23:23:15 -0400 |
commit | 2667c6f935d979cea1ab7fa58568fd0fd725525f (patch) | |
tree | 09dd3853448c02801ad5c5fc8a1840b6fc947232 /fs/xfs | |
parent | eac152b4742ec5f1ed04d73d699ae2be3607d56b (diff) |
xfs: kill VN_CACHED
Only has 2 users, has outlived it's usefulness.
Signed-off-by: Dave Chinner <dchinner@redhat.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Dave Chinner <david@fromorbit.com>
Diffstat (limited to 'fs/xfs')
-rw-r--r-- | fs/xfs/xfs_bmap_util.c | 4 | ||||
-rw-r--r-- | fs/xfs/xfs_vnode.h | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/fs/xfs/xfs_bmap_util.c b/fs/xfs/xfs_bmap_util.c index 56f050efcac8..1b79b8c19c37 100644 --- a/fs/xfs/xfs_bmap_util.c +++ b/fs/xfs/xfs_bmap_util.c | |||
@@ -862,7 +862,7 @@ xfs_can_free_eofblocks(struct xfs_inode *ip, bool force) | |||
862 | * have speculative prealloc/delalloc blocks to remove. | 862 | * have speculative prealloc/delalloc blocks to remove. |
863 | */ | 863 | */ |
864 | if (VFS_I(ip)->i_size == 0 && | 864 | if (VFS_I(ip)->i_size == 0 && |
865 | VN_CACHED(VFS_I(ip)) == 0 && | 865 | VFS_I(ip)->i_mapping->nrpages == 0 && |
866 | ip->i_delayed_blks == 0) | 866 | ip->i_delayed_blks == 0) |
867 | return false; | 867 | return false; |
868 | 868 | ||
@@ -1720,7 +1720,7 @@ xfs_swap_extents( | |||
1720 | truncate_pagecache_range(VFS_I(tip), 0, -1); | 1720 | truncate_pagecache_range(VFS_I(tip), 0, -1); |
1721 | 1721 | ||
1722 | /* Verify O_DIRECT for ftmp */ | 1722 | /* Verify O_DIRECT for ftmp */ |
1723 | if (VN_CACHED(VFS_I(tip)) != 0) { | 1723 | if (VFS_I(tip)->i_mapping->nrpages) { |
1724 | error = -EINVAL; | 1724 | error = -EINVAL; |
1725 | goto out_unlock; | 1725 | goto out_unlock; |
1726 | } | 1726 | } |
diff --git a/fs/xfs/xfs_vnode.h b/fs/xfs/xfs_vnode.h index 07b475aa896c..bcf0c74f0d2f 100644 --- a/fs/xfs/xfs_vnode.h +++ b/fs/xfs/xfs_vnode.h | |||
@@ -38,7 +38,6 @@ struct attrlist_cursor_kern; | |||
38 | * Some useful predicates. | 38 | * Some useful predicates. |
39 | */ | 39 | */ |
40 | #define VN_MAPPED(vp) mapping_mapped(vp->i_mapping) | 40 | #define VN_MAPPED(vp) mapping_mapped(vp->i_mapping) |
41 | #define VN_CACHED(vp) (vp->i_mapping->nrpages) | ||
42 | 41 | ||
43 | 42 | ||
44 | #endif /* __XFS_VNODE_H__ */ | 43 | #endif /* __XFS_VNODE_H__ */ |