Merge remote-tracking branch 'jk/vfs' into work.misc

diff --cc fs/attr.c
Simple merge

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

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

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

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

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

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

diff --cc fs/orangefs/inode.c
index d4c6915,cff00eb..c83846f
--- 1/fs/orangefs/inode.c
--- 2/fs/orangefs/inode.c
+++ b/fs/orangefs/inode.c
@@@ -216,10 -216,10 +216,10 @@@ int orangefs_setattr(struct dentry *den
        struct inode *inode = dentry->d_inode;
  
        gossip_debug(GOSSIP_INODE_DEBUG,
 -                   "orangefs_setattr: called on %s\n",
 -                   dentry->d_name.name);
 +                   "orangefs_setattr: called on %pd\n",
 +                   dentry);
  
-       ret = inode_change_ok(inode, iattr);
+       ret = setattr_prepare(dentry, iattr);
        if (ret)
                goto out;
  

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

diff --cc fs/posix_acl.c
Simple merge

diff --cc fs/proc/base.c
Simple merge

diff --cc fs/utimes.c
Simple merge

diff --cc fs/xfs/xfs_file.c
Simple merge

diff --cc fs/xfs/xfs_iops.c
Simple merge

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

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

diff --cc mm/shmem.c
Simple merge