[XFS] move v_iocount from bhv_vnode to xfs_inode

struct bhv_vnode is on it's way out, so move the I/O count to the XFS
inode.

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

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, 7 insertions, 5 deletions

diff --git a/fs/xfs/linux-2.6/xfs_vnode.h b/fs/xfs/linux-2.6/xfs_vnode.h
index c8af208a73dc..321346d95267 100644
--- a/fs/xfs/linux-2.6/xfs_vnode.h
+++ b/fs/xfs/linux-2.6/xfs_vnode.h
@@ -29,7 +29,6 @@ typedef __u64		bhv_vnumber_t;
 
 typedef struct bhv_vnode {
         bhv_vnumber_t   v_number;               /* in-core vnode number */
-        atomic_t        v_iocount;              /* outstanding I/O count */
 #ifdef XFS_VNODE_TRACE
         struct ktrace   *v_trace;               /* trace header structure    */
 #endif
@@ -202,10 +201,13 @@ extern int	vn_revalidate(struct bhv_vnode *);
 extern int      __vn_revalidate(struct bhv_vnode *, bhv_vattr_t *);
 extern void     vn_revalidate_core(struct bhv_vnode *, bhv_vattr_t *);
 
-extern void     vn_iowait(struct bhv_vnode *vp);
-extern void     vn_iowake(struct bhv_vnode *vp);
-
-extern void     vn_ioerror(struct bhv_vnode *vp, int error, char *f, int l);
+/*
+ * Yeah, these don't take vnode anymore at all, all this should be
+ * cleaned up at some point.
+ */
+extern void     vn_iowait(struct xfs_inode *ip);
+extern void     vn_iowake(struct xfs_inode *ip);
+extern void     vn_ioerror(struct xfs_inode *ip, int error, char *f, int l);
 
 static inline int vn_count(struct bhv_vnode *vp)
 {