diff options
| author | Dave Chinner <dchinner@redhat.com> | 2012-11-12 22:53:55 +1100 |
|---|---|---|
| committer | Ben Myers <bpm@sgi.com> | 2012-11-14 15:12:20 -0600 |
| commit | 95eacf0f71b7682a05b8242c49c68e8e4bb673e3 (patch) | |
| tree | f57a66b71448d44f99910aed6b544f3fc8611062 | |
| parent | d6638ae244f6323fcdf85e72eb4a5af6f6212893 (diff) | |
| download | olio-linux-3.10-95eacf0f71b7682a05b8242c49c68e8e4bb673e3.tar.xz olio-linux-3.10-95eacf0f71b7682a05b8242c49c68e8e4bb673e3.zip | |
xfs: remove xfs_wait_on_pages()
It's just a simple wrapper around a VFS function that is only called
by another function in xfs_fs_subr.c. Remove it and call the VFS
function directly.
Signed-off-by: Dave Chinner <dchinner@redhat.com>
Reviewed-by: Andrew Dahl <adahl@sgi.com>
Signed-off-by: Ben Myers <bpm@sgi.com>
| -rw-r--r-- | fs/xfs/xfs_fs_subr.c | 18 | ||||
| -rw-r--r-- | fs/xfs/xfs_vnodeops.h | 1 |
2 files changed, 2 insertions, 17 deletions
diff --git a/fs/xfs/xfs_fs_subr.c b/fs/xfs/xfs_fs_subr.c index d49de3d7045..33658234dfc 100644 --- a/fs/xfs/xfs_fs_subr.c +++ b/fs/xfs/xfs_fs_subr.c @@ -62,23 +62,9 @@ xfs_flush_pages( last == -1 ? LLONG_MAX : last); if (flags & XBF_ASYNC) return ret; - ret2 = xfs_wait_on_pages(ip, first, last); + ret2 = -filemap_fdatawait_range(mapping, first, + last == -1 ? XFS_ISIZE(ip) - 1 : last); if (!ret) ret = ret2; return ret; } - -int -xfs_wait_on_pages( - xfs_inode_t *ip, - xfs_off_t first, - xfs_off_t last) -{ - struct address_space *mapping = VFS_I(ip)->i_mapping; - - if (mapping_tagged(mapping, PAGECACHE_TAG_WRITEBACK)) { - return -filemap_fdatawait_range(mapping, first, - last == -1 ? XFS_ISIZE(ip) - 1 : last); - } - return 0; -} diff --git a/fs/xfs/xfs_vnodeops.h b/fs/xfs/xfs_vnodeops.h index d48141d6bc3..c8ad48b61a2 100644 --- a/fs/xfs/xfs_vnodeops.h +++ b/fs/xfs/xfs_vnodeops.h @@ -52,7 +52,6 @@ int xfs_flushinval_pages(struct xfs_inode *ip, xfs_off_t first, xfs_off_t last, int fiopt); int xfs_flush_pages(struct xfs_inode *ip, xfs_off_t first, xfs_off_t last, uint64_t flags, int fiopt); -int xfs_wait_on_pages(struct xfs_inode *ip, xfs_off_t first, xfs_off_t last); int xfs_zero_eof(struct xfs_inode *, xfs_off_t, xfs_fsize_t); int xfs_free_eofblocks(struct xfs_mount *, struct xfs_inode *, bool); |