From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Benjamin LaHaise <bcrl@kvack.org>, Al Viro <viro@ZenIV.linux.org.uk>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Christoph Hellwig <hch@lst.de>
Subject: Re: linux-next: manual merge of the aio tree with the vfs tree
Date: Mon, 14 Mar 2016 15:36:47 +1100 [thread overview]
Message-ID: <20160314153647.09236b8d@canb.auug.org.au> (raw)
In-Reply-To: <20160314153214.41d7c2fe@canb.auug.org.au>
Hi all,
On Mon, 14 Mar 2016 15:32:14 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> I also added the following merge fix patch:
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Mon, 14 Mar 2016 15:28:05 +1100
> Subject: [PATCH] vfs: do_loop_readv_writev() API change merge fix
>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
> fs/internal.h | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/fs/internal.h b/fs/internal.h
> index 3bbe63d5eb5e..39f6e9831c5f 100644
> --- a/fs/internal.h
> +++ b/fs/internal.h
> @@ -139,7 +139,7 @@ extern long prune_dcache_sb(struct super_block *sb, struct shrink_control *sc);
> */
> extern int rw_verify_area(int, struct file *, const loff_t *, size_t);
> extern ssize_t do_loop_readv_writev(struct file *filp, struct iov_iter *iter,
> - loff_t *ppos, io_fn_t fn);
> + loff_t *ppos, io_fn_t fn, int flags);
>
>
> /*
And I forgot this bit :-(
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 14 Mar 2016 15:34:17 +1100
Subject: [PATCH] vfs: do_loop_readv_writev API merge fix up part 2
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
fs/aio.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/fs/aio.c b/fs/aio.c
index b079cb65a90f..d2dd7d482ffe 100644
--- a/fs/aio.c
+++ b/fs/aio.c
@@ -1576,7 +1576,7 @@ static long aio_thread_op_read_iter(struct aio_kiocb *iocb)
} else if (filp->f_op->read)
ret = do_loop_readv_writev(filp, &iocb->ki_iter,
&iocb->common.ki_pos,
- filp->f_op->read);
+ filp->f_op->read, 0);
else
ret = -EINVAL;
unuse_mm(iocb->ki_ctx->mm);
--
2.7.0
--
Cheers,
Stephen Rothwell
next prev parent reply other threads:[~2016-03-14 4:36 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-14 4:32 linux-next: manual merge of the aio tree with the vfs tree Stephen Rothwell
2016-03-14 4:36 ` Stephen Rothwell [this message]
2016-03-14 4:41 ` Stephen Rothwell
2016-03-14 7:35 ` Christoph Hellwig
2016-03-14 15:24 ` Benjamin LaHaise
2016-03-15 5:35 ` Al Viro
2016-03-15 13:24 ` Benjamin LaHaise
2016-03-15 8:37 ` Christoph Hellwig
2016-03-15 4:06 Stephen Rothwell
2016-03-15 4:34 ` Al Viro
2016-03-15 4:53 ` Stephen Rothwell
2016-03-15 5:07 ` Al Viro
2016-03-15 5:19 ` Al Viro
2016-03-15 13:12 ` Benjamin LaHaise
2017-09-11 1:29 Stephen Rothwell
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=20160314153647.09236b8d@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=bcrl@kvack.org \
--cc=hch@lst.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=viro@ZenIV.linux.org.uk \
/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;
as well as URLs for NNTP newsgroup(s).