xfs
[Top] [All Lists]

[PATCH 4/6] xfs: kill VN_CACHED

To: xfs@xxxxxxxxxxx
Subject: [PATCH 4/6] xfs: kill VN_CACHED
From: Dave Chinner <david@xxxxxxxxxxxxx>
Date: Thu, 31 Jul 2014 17:33:13 +1000
Delivered-to: xfs@xxxxxxxxxxx
In-reply-to: <1406791995-14723-1-git-send-email-david@xxxxxxxxxxxxx>
References: <1406791995-14723-1-git-send-email-david@xxxxxxxxxxxxx>
From: Dave Chinner <dchinner@xxxxxxxxxx>

Only has 2 users, has outlived it's usefulness.

Signed-off-by: Dave Chinner <dchinner@xxxxxxxxxx>
Signed-off-by: Dave Chinner <david@xxxxxxxxxxxxx>
---
 fs/xfs/xfs_bmap_util.c | 4 ++--
 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 d32889a..8da2a6a 100644
--- a/fs/xfs/xfs_bmap_util.c
+++ b/fs/xfs/xfs_bmap_util.c
@@ -809,7 +809,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;
 
@@ -1667,7 +1667,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 07b475a..bcf0c74 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__ */
-- 
2.0.0

<Prev in Thread] Current Thread [Next in Thread>