From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Benjamin LaHaise <bcrl@kvack.org>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Kent Overstreet <koverstreet@google.com>,
Asias He <asias@redhat.com>,
Dave Kleikamp <dave.kleikamp@oracle.com>
Subject: linux-next: manual merge of the aio tree with the aio-direct tree
Date: Wed, 21 Aug 2013 17:21:34 +1000 [thread overview]
Message-ID: <20130821172134.cb52a6e4b7eab3abec0adc0c@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 941 bytes --]
Hi Benjamin,
Today's linux-next merge of the aio 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 73a7075e3f6e ("aio: Kill
aio_rw_vect_retry()") from the aio 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,8772b15..0000000
--- a/fs/block_dev.c
+++ b/fs/block_dev.c
@@@ -1541,9 -1542,9 +1541,9 @@@ static ssize_t blkdev_read_iter(struct
return 0;
size -= pos;
- if (size < iocb->ki_left)
+ if (size < iocb->ki_nbytes)
- nr_segs = iov_shorten((struct iovec *)iov, nr_segs, size);
- return generic_file_aio_read(iocb, iov, nr_segs, pos);
+ iov_iter_shorten(iter, size);
+ return generic_file_read_iter(iocb, iter, pos);
}
/*
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
next reply other threads:[~2013-08-21 7:21 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-08-21 7:21 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2013-08-21 7:21 linux-next: manual merge of the aio tree with the aio-direct tree 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=20130821172134.cb52a6e4b7eab3abec0adc0c@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=asias@redhat.com \
--cc=bcrl@kvack.org \
--cc=dave.kleikamp@oracle.com \
--cc=koverstreet@google.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
/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).