* linux-next: manual merge of the aio-direct tree with the btrfs tree
@ 2013-11-13 2:05 Stephen Rothwell
0 siblings, 0 replies; only message in thread
From: Stephen Rothwell @ 2013-11-13 2:05 UTC (permalink / raw)
To: Dave Kleikamp, Chris Mason; +Cc: linux-next, linux-kernel, Josef Bacik
[-- Attachment #1: Type: text/plain, Size: 1030 bytes --]
Hi Dave,
Today's linux-next merge of the aio-direct tree got a conflict in
fs/btrfs/inode.c between commit 0ef8b726075a ("Btrfs: return an error
from btrfs_wait_ordered_range") from the btrfs tree and commit
921057174f1c ("dio: Convert direct_IO to use iov_iter") from the
aio-direct 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/btrfs/inode.c
index da8d2f696ac5,6feae86d24df..000000000000
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@@ -7234,10 -7233,8 +7247,10 @@@ static ssize_t btrfs_direct_IO(int rw,
* call btrfs_wait_ordered_range to make absolutely sure that any
* outstanding dirty pages are on disk.
*/
- count = iov_length(iov, nr_segs);
+ count = iov_iter_count(iter);
- btrfs_wait_ordered_range(inode, offset, count);
+ ret = btrfs_wait_ordered_range(inode, offset, count);
+ if (ret)
+ return ret;
if (rw & WRITE) {
/*
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2013-11-13 2:05 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-11-13 2:05 linux-next: manual merge of the aio-direct tree with the btrfs tree Stephen Rothwell
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).