Merge branch 'work.preadv2' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 17 May 2016 22:05:23 +0000 (15:05 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 17 May 2016 22:05:23 +0000 (15:05 -0700)
Pull vfs cleanups from Al Viro:
 "More cleanups from Christoph"

* 'work.preadv2' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  nfsd: use RWF_SYNC
  fs: add RWF_DSYNC aand RWF_SYNC
  ceph: use generic_write_sync
  fs: simplify the generic_write_sync prototype
  fs: add IOCB_SYNC and IOCB_DSYNC
  direct-io: remove the offset argument to dio_complete
  direct-io: eliminate the offset argument to ->direct_IO
  xfs: eliminate the pos variable in xfs_file_dio_aio_write
  filemap: remove the pos argument to generic_file_direct_write
  filemap: remove pos variables in generic_file_read_iter

15 files changed:
1  2 
fs/btrfs/inode.c
fs/f2fs/data.c
fs/f2fs/file.c
fs/fuse/file.c
fs/gfs2/file.c
fs/hfs/inode.c
fs/hfsplus/inode.c
fs/jfs/inode.c
fs/nfs/direct.c
fs/ocfs2/aops.c
fs/read_write.c
fs/xfs/xfs_file.c
include/linux/fs.h
include/linux/nfs_fs.h
mm/page_io.c

Simple merge
diff --cc fs/f2fs/data.c
Simple merge
diff --cc fs/f2fs/file.c
Simple merge
diff --cc fs/fuse/file.c
Simple merge
diff --cc fs/gfs2/file.c
Simple merge
diff --cc fs/hfs/inode.c
Simple merge
Simple merge
diff --cc fs/jfs/inode.c
Simple merge
diff --cc fs/nfs/direct.c
Simple merge
diff --cc fs/ocfs2/aops.c
Simple merge
diff --cc fs/read_write.c
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc mm/page_io.c
Simple merge