Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

Pull third hunk of vfs changes from Al Viro:
 "This contains the ->direct_IO() changes from Omar + saner
  generic_write_checks() + dealing with fcntl()/{read,write}() races
  (mirroring O_APPEND/O_DIRECT into iocb->ki_flags and instead of
  repeatedly looking at ->f_flags, which can be changed by fcntl(2),
  check ->ki_flags - which cannot) + infrastructure bits for dhowells'
  d_inode annotations + Christophs switch of /dev/loop to
  vfs_iter_write()"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: (30 commits)
  block: loop: switch to VFS ITER_BVEC
  configfs: Fix inconsistent use of file_inode() vs file->f_path.dentry->d_inode
  VFS: Make pathwalk use d_is_reg() rather than S_ISREG()
  VFS: Fix up debugfs to use d_is_dir() in place of S_ISDIR()
  VFS: Combine inode checks with d_is_negative() and d_is_positive() in pathwalk
  NFS: Don't use d_inode as a variable name
  VFS: Impose ordering on accesses of d_inode and d_flags
  VFS: Add owner-filesystem positive/negative dentry checks
  nfs: generic_write_checks() shouldn't be done on swapout...
  ocfs2: use __generic_file_write_iter()
  mirror O_APPEND and O_DIRECT into iocb->ki_flags
  switch generic_write_checks() to iocb and iter
  ocfs2: move generic_write_checks() before the alignment checks
  ocfs2_file_write_iter: stop messing with ppos
  udf_file_write_iter: reorder and simplify
  fuse: ->direct_IO() doesn't need generic_write_checks()
  ext4_file_write_iter: move generic_write_checks() up
  xfs_file_aio_write_checks: switch to iocb/iov_iter
  generic_write_checks(): drop isblk argument
  blkdev_write_iter: expand generic_file_checks() call in there
  ...

diff --cc Documentation/filesystems/Locking
Simple merge

diff --cc drivers/staging/lustre/lustre/llite/rw26.c
Simple merge

diff --cc fs/aio.c
Simple merge

diff --cc fs/dax.c
Simple merge

diff --cc fs/debugfs/inode.c
Simple merge

diff --cc fs/ext2/inode.c
Simple merge

diff --cc fs/ext4/ext4.h
Simple merge

diff --cc fs/ext4/file.c
Simple merge

diff --cc fs/ext4/inode.c
Simple merge

diff --cc fs/gfs2/aops.c
Simple merge

diff --cc fs/gfs2/file.c
Simple merge

diff --cc fs/ocfs2/aops.c
index 8d2bc840c288743e97df31fe99bce0b00e34a1b6,28b5ad81bbec7b4686b3e6475570fe7393a3820a..f906a250da6addcd0d2cdc796f383a312fe80224
--- 1/fs/ocfs2/aops.c
--- 2/fs/ocfs2/aops.c
+++ b/fs/ocfs2/aops.c
@@@ -853,12 -734,13 +853,11 @@@ static ssize_t ocfs2_direct_IO_write(st
                }
  
                ocfs2_inode_unlock(inode, 1);
 -              brelse(di_bh);
 -              di_bh = NULL;
        }
  
-       written = __blockdev_direct_IO(WRITE, iocb, inode, inode->i_sb->s_bdev,
-                       iter, offset,
-                       ocfs2_direct_IO_get_blocks,
-                       ocfs2_dio_end_io, NULL, 0);
+       written = __blockdev_direct_IO(iocb, inode, inode->i_sb->s_bdev, iter,
+                                      offset, ocfs2_direct_IO_get_blocks,
+                                      ocfs2_dio_end_io, NULL, 0);
        if (unlikely(written < 0)) {
                loff_t i_size = i_size_read(inode);
  

diff --cc fs/udf/file.c
Simple merge

diff --cc fs/udf/inode.c
Simple merge

diff --cc include/linux/fs.h
Simple merge

diff --cc mm/filemap.c
Simple merge