linux-next: manual merge of the aio-direct tree with the btrfs tree

[Stephen Rothwell]

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@xxxxxxxxxxxxxxxx

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: pgp00000.pgp
Description: PGP signature