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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <20160314154140.46e0706a@canb.auug.org.au>
Date:	Mon, 14 Mar 2016 15:41:40 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Benjamin LaHaise <bcrl@...ck.org>,
	Al Viro <viro@...IV.linux.org.uk>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Christoph Hellwig <hch@....de>
Subject: Re: linux-next: manual merge of the aio tree with the vfs tree

Hi all,

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

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

From: Stephen Rothwell <sfr@...b.auug.org.au>
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@...b.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 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