From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 16 May 2014 01:07:19 +0000 (+1000)
Subject: Merge remote-tracking branch 'vfs/for-next'
X-Git-Tag: next-20140516~79
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=e52bc4327285e60b4d3048e433e22b21d1b04c20;p=karo-tx-linux.git

Merge remote-tracking branch 'vfs/for-next'

Conflicts:
	fs/cifs/cifsfs.c
	fs/f2fs/file.c
---

e52bc4327285e60b4d3048e433e22b21d1b04c20
diff --cc fs/cifs/file.c
index 208f56eca4bf,60e9b5fa2212..e90a1e9aa627
--- a/fs/cifs/file.c
+++ b/fs/cifs/file.c
@@@ -2560,9 -2558,9 +2558,9 @@@ ssize_t cifs_user_writev(struct kiocb *
  	 * write request.
  	 */
  
- 	written = cifs_iovec_write(iocb->ki_filp, iov, nr_segs, &pos);
+ 	written = cifs_iovec_write(iocb->ki_filp, from, &pos);
  	if (written > 0) {
 -		CIFS_I(inode)->invalid_mapping = true;
 +		set_bit(CIFS_INO_INVALID_MAPPING, &CIFS_I(inode)->flags);
  		iocb->ki_pos = pos;
  	}
  
diff --cc fs/f2fs/file.c
index d97e5c458f36,e4ba4b93f96a..37d0e1f512a9
--- a/fs/f2fs/file.c
+++ b/fs/f2fs/file.c
@@@ -805,11 -678,11 +805,11 @@@ long f2fs_compat_ioctl(struct file *fil
  #endif
  
  const struct file_operations f2fs_file_operations = {
 -	.llseek		= generic_file_llseek,
 +	.llseek		= f2fs_llseek,
- 	.read		= do_sync_read,
- 	.write		= do_sync_write,
- 	.aio_read	= generic_file_aio_read,
- 	.aio_write	= generic_file_aio_write,
+ 	.read		= new_sync_read,
+ 	.write		= new_sync_write,
+ 	.read_iter	= generic_file_read_iter,
+ 	.write_iter	= generic_file_write_iter,
  	.open		= generic_file_open,
  	.mmap		= f2fs_file_mmap,
  	.fsync		= f2fs_sync_file,