diff options
author | Christoph Hellwig <hch@infradead.org> | 2007-08-28 21:46:28 -0400 |
---|---|---|
committer | Tim Shimmin <tes@chook.melbourne.sgi.com> | 2007-10-15 21:38:56 -0400 |
commit | b677c210cec0d6755335ffc01691982c417dd39e (patch) | |
tree | 9a61fdd81e48aac948346a096bed9c72e5f34114 /fs/xfs/xfs_inode.c | |
parent | 09262b4339de5417a10803fbfac277eebb38ca5a (diff) |
[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>
Diffstat (limited to 'fs/xfs/xfs_inode.c')
-rw-r--r-- | fs/xfs/xfs_inode.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c index c07553bbcdb4..0349e714dc30 100644 --- a/fs/xfs/xfs_inode.c +++ b/fs/xfs/xfs_inode.c | |||
@@ -864,6 +864,7 @@ xfs_iread( | |||
864 | ip = kmem_zone_zalloc(xfs_inode_zone, KM_SLEEP); | 864 | ip = kmem_zone_zalloc(xfs_inode_zone, KM_SLEEP); |
865 | ip->i_ino = ino; | 865 | ip->i_ino = ino; |
866 | ip->i_mount = mp; | 866 | ip->i_mount = mp; |
867 | atomic_set(&ip->i_iocount, 0); | ||
867 | spin_lock_init(&ip->i_flags_lock); | 868 | spin_lock_init(&ip->i_flags_lock); |
868 | 869 | ||
869 | /* | 870 | /* |
@@ -1455,7 +1456,7 @@ xfs_itruncate_start( | |||
1455 | mp = ip->i_mount; | 1456 | mp = ip->i_mount; |
1456 | vp = XFS_ITOV(ip); | 1457 | vp = XFS_ITOV(ip); |
1457 | 1458 | ||
1458 | vn_iowait(vp); /* wait for the completion of any pending DIOs */ | 1459 | vn_iowait(ip); /* wait for the completion of any pending DIOs */ |
1459 | 1460 | ||
1460 | /* | 1461 | /* |
1461 | * Call toss_pages or flushinval_pages to get rid of pages | 1462 | * Call toss_pages or flushinval_pages to get rid of pages |