[XFS] kill the v_flag member in struct bhv_vnode

All flags previously handled at the vnode level are not in the xfs_inode
where we already have a flags mechanisms and free bits for flags
previously in the vnode.

SGI-PV: 969608
SGI-Modid: xfs-linux-melb:xfs-kern:29495a

Signed-off-by: Christoph Hellwig <hch@infradead.org>
Signed-off-by: David Chinner <dgc@sgi.com>
Signed-off-by: Tim Shimmin <tes@sgi.com>

1 files changed, 4 insertions, 7 deletions

diff --git a/fs/xfs/linux-2.6/xfs_aops.c b/fs/xfs/linux-2.6/xfs_aops.c
index 28ccca98839b..22a40bd0cce2 100644
--- a/fs/xfs/linux-2.6/xfs_aops.c
+++ b/fs/xfs/linux-2.6/xfs_aops.c
@@ -304,13 +304,13 @@ xfs_map_blocks(
         xfs_iomap_t             *mapp,
         int                     flags)
 {
-        bhv_vnode_t             *vp = vn_from_inode(inode);
+        xfs_inode_t             *ip = XFS_I(inode);
         int                     error, nmaps = 1;
 
-        error = xfs_bmap(xfs_vtoi(vp), offset, count,
+        error = xfs_bmap(ip, offset, count,
                                 flags, mapp, &nmaps);
         if (!error && (flags & (BMAPI_WRITE|BMAPI_ALLOCATE)))
-                VMODIFY(vp);
+                xfs_iflags_set(ip, XFS_IMODIFIED);
         return -error;
 }
 
@@ -1246,10 +1246,7 @@ xfs_vm_writepages(
         struct address_space    *mapping,
         struct writeback_control *wbc)
 {
-        struct bhv_vnode        *vp = vn_from_inode(mapping->host);
-
-        if (VN_TRUNC(vp))
-                VUNTRUNCATE(vp);
+        xfs_iflags_clear(XFS_I(mapping->host), XFS_ITRUNCATED);
         return generic_writepages(mapping, wbc);
 }