linux-next: manual merge of the vfs tree with the f2fs tree

[Stephen Rothwell <sfr@canb.auug.org.au>]

[-- Attachment #1: Type: text/plain, Size: 1254 bytes --]

Hi Al,

Today's linux-next merge of the vfs tree got a conflict in
fs/f2fs/data.c between commit b6fe5873cb42 ("f2fs: fix to recover data
written by dio") from the f2fs tree and commits d8d3d94b80aa ("pass
iov_iter to ->direct_IO()") and 31b140398ce5 ("switch
{__,}blockdev_direct_IO() to iov_iter") 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/f2fs/data.c
index c1fb6dd10911,1d2e7e9624d2..000000000000
--- a/fs/f2fs/data.c
+++ b/fs/f2fs/data.c
@@@ -1044,14 -1018,11 +1043,14 @@@ static ssize_t f2fs_direct_IO(int rw, s
  	if (f2fs_has_inline_data(inode))
  		return 0;
  
- 	if (check_direct_IO(inode, rw, iov, offset, nr_segs))
+ 	if (check_direct_IO(inode, rw, iter, offset))
  		return 0;
  
 +	/* clear fsync mark to recover these blocks */
 +	fsync_mark_clear(F2FS_SB(inode->i_sb), inode->i_ino);
 +
- 	return blockdev_direct_IO(rw, iocb, inode, iov, offset, nr_segs,
- 							get_data_block);
+ 	return blockdev_direct_IO(rw, iocb, inode, iter, offset,
+ 				  get_data_block);
  }
  
  static void f2fs_invalidate_data_page(struct page *page, unsigned int offset,

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 836 bytes --]