xfs: remove i_iocount
We now have an i_dio_count filed and surrounding infrastructure to wait for direct I/O completion instead of i_icount, and we have never needed to iocount waits for buffered I/O given that we only set the page uptodate after finishing all required work. Thus remove i_iocount, and replace the actually needed waits with calls to inode_dio_wait. Signed-off-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Dave Chinner <dchinner@redhat.com> Signed-off-by: Alex Elder <aelder@sgi.com>
This commit is contained in:

committed by
Alex Elder

parent
2b3ffd7eb7
commit
4a06fd262d
@@ -796,8 +796,6 @@ xfs_fs_destroy_inode(
|
||||
if (is_bad_inode(inode))
|
||||
goto out_reclaim;
|
||||
|
||||
xfs_ioend_wait(ip);
|
||||
|
||||
ASSERT(XFS_FORCED_SHUTDOWN(ip->i_mount) || ip->i_delayed_blks == 0);
|
||||
|
||||
/*
|
||||
@@ -837,7 +835,6 @@ xfs_fs_inode_init_once(
|
||||
inode_init_once(VFS_I(ip));
|
||||
|
||||
/* xfs inode */
|
||||
atomic_set(&ip->i_iocount, 0);
|
||||
atomic_set(&ip->i_pincount, 0);
|
||||
spin_lock_init(&ip->i_flags_lock);
|
||||
init_waitqueue_head(&ip->i_ipin_wait);
|
||||
@@ -914,9 +911,8 @@ xfs_fs_write_inode(
|
||||
* of forcing it all the way to stable storage using a
|
||||
* synchronous transaction we let the log force inside the
|
||||
* ->sync_fs call do that for thus, which reduces the number
|
||||
* of synchronous log foces dramatically.
|
||||
* of synchronous log forces dramatically.
|
||||
*/
|
||||
xfs_ioend_wait(ip);
|
||||
error = xfs_log_inode(ip);
|
||||
if (error)
|
||||
goto out;
|
||||
@@ -1681,7 +1677,6 @@ init_xfs_fs(void)
|
||||
printk(KERN_INFO XFS_VERSION_STRING " with "
|
||||
XFS_BUILD_OPTIONS " enabled\n");
|
||||
|
||||
xfs_ioend_init();
|
||||
xfs_dir_startup();
|
||||
|
||||
error = xfs_init_zones();
|
||||
|
Reference in New Issue
Block a user