diff options
| author |   Christoph Hellwig <hch@infradead.org> | 2007-08-29 11:46:28 +1000 |
|---|---|---|
| committer |   Tim Shimmin <tes@chook.melbourne.sgi.com> | 2007-10-16 11:38:56 +1000 |
| commit | b677c210cec0d6755335ffc01691982c417dd39e (patch) | |
| tree | 9a61fdd81e48aac948346a096bed9c72e5f34114 /fs/xfs/xfs_vnodeops.c | |
| parent | [XFS] Create xfs_iflags_test_and_clear helper function (diff) | |
| download | linux-dev-b677c210cec0d6755335ffc01691982c417dd39e.tar.xz linux-dev-b677c210cec0d6755335ffc01691982c417dd39e.zip | |
[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_vnodeops.c')
| -rw-r--r-- | fs/xfs/xfs_vnodeops.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/xfs/xfs_vnodeops.c b/fs/xfs/xfs_vnodeops.c index 8ed7af3c5d63..e7ef78fb4da3 100644 --- a/fs/xfs/xfs_vnodeops.c +++ b/fs/xfs/xfs_vnodeops.c @@ -598,7 +598,7 @@ xfs_setattr( } /* wait for all I/O to complete */ - vn_iowait(vp); + vn_iowait(ip); if (!code) code = xfs_itruncate_data(ip, vap->va_size); @@ -3683,7 +3683,7 @@ xfs_reclaim( return 0; } - vn_iowait(vp); + vn_iowait(ip); ASSERT(XFS_FORCED_SHUTDOWN(ip->i_mount) || ip->i_delayed_blks == 0); @@ -4189,7 +4189,7 @@ xfs_free_file_space( need_iolock = 0; if (need_iolock) { xfs_ilock(ip, XFS_IOLOCK_EXCL); - vn_iowait(vp); /* wait for the completion of any pending DIOs */ + vn_iowait(ip); /* wait for the completion of any pending DIOs */ } rounding = max_t(uint, 1 << mp->m_sb.sb_blocklog, NBPP); |