From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Al Viro <viro@ZenIV.linux.org.uk>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Christoph Hellwig <hch@infradead.org>,
Asias He <asias@redhat.com>,
Dave Kleikamp <dave.kleikamp@oracle.com>
Subject: linux-next: manual merge of the vfs tree with the aio-direct tree
Date: Thu, 5 Sep 2013 12:54:57 +1000 [thread overview]
Message-ID: <20130905125457.5f1e5e843167a0aaee7816f8@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 943 bytes --]
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@canb.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);
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
next reply other threads:[~2013-09-05 2:54 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-09-05 2:54 Stephen Rothwell [this message]
2013-09-05 3:02 linux-next: manual merge of the vfs tree with the aio-direct tree Stephen Rothwell
2013-09-18 0:56 Stephen Rothwell
2013-09-18 2:00 ` Al Viro
2013-09-18 3:25 ` Dave Kleikamp
2013-09-18 17:06 ` Zach Brown
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=20130905125457.5f1e5e843167a0aaee7816f8@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=asias@redhat.com \
--cc=dave.kleikamp@oracle.com \
--cc=hch@infradead.org \
--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).