From: Andrew Dahl <adahl@sgi.com>
To: Dave Chinner <david@fromorbit.com>
Cc: xfs@oss.sgi.com
Subject: Re: [PATCH 2/4] xfs: remove xfs_wait_on_pages()
Date: Mon, 12 Nov 2012 14:44:07 -0600 [thread overview]
Message-ID: <50A15F97.3020901@sgi.com> (raw)
In-Reply-To: <1352455804-17045-3-git-send-email-david@fromorbit.com>
On 11/09/2012 04:10 AM, Dave Chinner wrote:
> From: Dave Chinner <dchinner@redhat.com>
>
> 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>
> ---
> fs/xfs/xfs_fs_subr.c | 18 ++----------------
> 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 d49de3d..3365823 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 d48141d..c8ad48b 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);
>
Looks good!
Reviewed-by: Andrew Dahl <adahl@sgi.com>
_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs
next prev parent reply other threads:[~2012-11-12 20:42 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-11-09 10:10 [PATCH 0/4] xfs: fs/xfs/xfs_fs_subr.c die die die Dave Chinner
2012-11-09 10:10 ` [PATCH 1/4] xfs: remove xfs_tosspages Dave Chinner
2012-11-12 20:43 ` Andrew Dahl
2012-11-12 23:00 ` Dave Chinner
2012-11-13 21:29 ` Ben Myers
2012-11-09 10:10 ` [PATCH 2/4] xfs: remove xfs_wait_on_pages() Dave Chinner
2012-11-12 20:44 ` Andrew Dahl [this message]
2012-11-09 10:10 ` [PATCH 3/4] xfs: remove xfs_flush_pages Dave Chinner
2012-11-12 20:50 ` Andrew Dahl
2012-11-09 10:10 ` [PATCH 4/4] xfs: remove xfs_flushinval_pages Dave Chinner
2012-11-12 22:38 ` Andrew Dahl
2012-11-09 17:40 ` [PATCH 0/4] xfs: fs/xfs/xfs_fs_subr.c die die die Ben Myers
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=50A15F97.3020901@sgi.com \
--to=adahl@sgi.com \
--cc=david@fromorbit.com \
--cc=xfs@oss.sgi.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox