From: Brian Foster <bfoster@redhat.com>
To: Christoph Hellwig <hch@lst.de>
Cc: linux-xfs@vger.kernel.org
Subject: Re: [PATCH] xfs: simplify setting bio flags
Date: Mon, 28 Oct 2019 11:01:49 -0400 [thread overview]
Message-ID: <20191028150149.GA26529@bfoster> (raw)
In-Reply-To: <20191025174213.32143-1-hch@lst.de>
On Fri, Oct 25, 2019 at 07:42:13PM +0200, Christoph Hellwig wrote:
> Stop using the deprecated bio_set_op_attrs helper, and use a single
> argument to xfs_buf_ioapply_map for the operation and flags.
>
> Signed-off-by: Christoph Hellwig <hch@lst.de>
> ---
Reviewed-by: Brian Foster <bfoster@redhat.com>
> fs/xfs/xfs_buf.c | 15 ++++++---------
> 1 file changed, 6 insertions(+), 9 deletions(-)
>
> diff --git a/fs/xfs/xfs_buf.c b/fs/xfs/xfs_buf.c
> index 9640e4174552..1e63dd3d1257 100644
> --- a/fs/xfs/xfs_buf.c
> +++ b/fs/xfs/xfs_buf.c
> @@ -1261,8 +1261,7 @@ xfs_buf_ioapply_map(
> int map,
> int *buf_offset,
> int *count,
> - int op,
> - int op_flags)
> + int op)
> {
> int page_index;
> int total_nr_pages = bp->b_page_count;
> @@ -1297,7 +1296,7 @@ xfs_buf_ioapply_map(
> bio->bi_iter.bi_sector = sector;
> bio->bi_end_io = xfs_buf_bio_end_io;
> bio->bi_private = bp;
> - bio_set_op_attrs(bio, op, op_flags);
> + bio->bi_opf = op;
>
> for (; size && nr_pages; nr_pages--, page_index++) {
> int rbytes, nbytes = PAGE_SIZE - offset;
> @@ -1342,7 +1341,6 @@ _xfs_buf_ioapply(
> {
> struct blk_plug plug;
> int op;
> - int op_flags = 0;
> int offset;
> int size;
> int i;
> @@ -1384,15 +1382,14 @@ _xfs_buf_ioapply(
> dump_stack();
> }
> }
> - } else if (bp->b_flags & XBF_READ_AHEAD) {
> - op = REQ_OP_READ;
> - op_flags = REQ_RAHEAD;
> } else {
> op = REQ_OP_READ;
> + if (bp->b_flags & XBF_READ_AHEAD)
> + op |= REQ_RAHEAD;
> }
>
> /* we only use the buffer cache for meta-data */
> - op_flags |= REQ_META;
> + op |= REQ_META;
>
> /*
> * Walk all the vectors issuing IO on them. Set up the initial offset
> @@ -1404,7 +1401,7 @@ _xfs_buf_ioapply(
> size = BBTOB(bp->b_length);
> blk_start_plug(&plug);
> for (i = 0; i < bp->b_map_count; i++) {
> - xfs_buf_ioapply_map(bp, i, &offset, &size, op, op_flags);
> + xfs_buf_ioapply_map(bp, i, &offset, &size, op);
> if (bp->b_error)
> break;
> if (size <= 0)
> --
> 2.20.1
>
next prev parent reply other threads:[~2019-10-28 15:01 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-25 17:42 [PATCH] xfs: simplify setting bio flags Christoph Hellwig
2019-10-28 15:01 ` Brian Foster [this message]
2019-10-28 16:38 ` Darrick J. Wong
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=20191028150149.GA26529@bfoster \
--to=bfoster@redhat.com \
--cc=hch@lst.de \
--cc=linux-xfs@vger.kernel.org \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.