linux-kernel - linux-next: manual merge of the vfs tree with the aio-direct 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>] [day] [month] [year] [list]

Date:	Thu, 5 Sep 2013 12:54:57 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Al Viro <viro@...IV.linux.org.uk>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Christoph Hellwig <hch@...radead.org>,
	Asias He <asias@...hat.com>,
	Dave Kleikamp <dave.kleikamp@...cle.com>
Subject: linux-next: manual merge of the vfs tree with the aio-direct tree

Hi Al,

Today's linux-next merge of the vfs tree got a conflict in fs/block_dev.c
between commit b176eedb2a8b ("block_dev: add support for read_iter,
write_iter") from the aio-direct tree and commit 02afc27faec9
("direct-io: Handle O_(D)SYNC AIO") from the vfs tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

diff --cc fs/block_dev.c
index 89d8ec5,1173a4e..0000000
--- a/fs/block_dev.c
+++ b/fs/block_dev.c
@@@ -1517,8 -1518,8 +1517,8 @@@ ssize_t blkdev_write_iter(struct kiocb 
  	BUG_ON(iocb->ki_pos != pos);
  
  	blk_start_plug(&plug);
 -	ret = __generic_file_aio_write(iocb, iov, nr_segs, &iocb->ki_pos);
 +	ret = __generic_file_write_iter(iocb, iter, &iocb->ki_pos);
- 	if (ret > 0 || ret == -EIOCBQUEUED) {
+ 	if (ret > 0) {
  		ssize_t err;
  
  		err = generic_write_sync(file, pos, ret);

Content of type "application/pgp-signature" skipped