summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorDave Chinner <dchinner@redhat.com>2014-08-04 13:23:15 +1000
committerDave Chinner <david@fromorbit.com>2014-08-04 13:23:15 +1000
commit2667c6f935d979cea1ab7fa58568fd0fd725525f (patch)
tree09dd3853448c02801ad5c5fc8a1840b6fc947232 /fs
parenteac152b4742ec5f1ed04d73d699ae2be3607d56b (diff)
downloadblackbird-op-linux-2667c6f935d979cea1ab7fa58568fd0fd725525f.tar.gz
blackbird-op-linux-2667c6f935d979cea1ab7fa58568fd0fd725525f.zip
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')
-rw-r--r--fs/xfs/xfs_bmap_util.c4
-rw-r--r--fs/xfs/xfs_vnode.h1
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)
* have speculative prealloc/delalloc blocks to remove.
*/
if (VFS_I(ip)->i_size == 0 &&
- VN_CACHED(VFS_I(ip)) == 0 &&
+ VFS_I(ip)->i_mapping->nrpages == 0 &&
ip->i_delayed_blks == 0)
return false;
@@ -1720,7 +1720,7 @@ xfs_swap_extents(
truncate_pagecache_range(VFS_I(tip), 0, -1);
/* Verify O_DIRECT for ftmp */
- if (VN_CACHED(VFS_I(tip)) != 0) {
+ if (VFS_I(tip)->i_mapping->nrpages) {
error = -EINVAL;
goto out_unlock;
}
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;
* Some useful predicates.
*/
#define VN_MAPPED(vp) mapping_mapped(vp->i_mapping)
-#define VN_CACHED(vp) (vp->i_mapping->nrpages)
#endif /* __XFS_VNODE_H__ */
OpenPOWER on IntegriCloud