Re: linux-next: manual merge of the aio tree with the vfs tree

[Stephen Rothwell]

Hi all,

On Mon, 14 Mar 2016 15:36:47 +1100 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
>
> And I forgot this bit :-(

And just to show I should be on holidays, this as well :-(

From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Date: Mon, 14 Mar 2016 15:38:22 +1100
Subject: [PATCH] vfs: do_loop_readv_writev API merge fix part 3

Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
---
 fs/aio.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fs/aio.c b/fs/aio.c
index d2dd7d482ffe..5652953d73bc 100644
--- a/fs/aio.c
+++ b/fs/aio.c
@@ -1626,7 +1626,7 @@ static long aio_thread_op_write_iter(struct aio_kiocb *iocb)
 	} else if (filp->f_op->write)
 		ret = do_loop_readv_writev(filp, &iocb->ki_iter,
 					   &iocb->common.ki_pos,
-					   (io_fn_t)filp->f_op->write);
+					   (io_fn_t)filp->f_op->write, 0);
 	else
 		ret = -EINVAL;
 	current->signal->rlim[RLIMIT_FSIZE].rlim_cur = saved_rlim_fsize;
-- 
2.7.0

-- 
Cheers,
Stephen Rothwell