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

Pull fourth vfs update from Al Viro:
 "d_inode() annotations from David Howells (sat in for-next since before
  the beginning of merge window) + four assorted fixes"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  RCU pathwalk breakage when running into a symlink overmounting something
  fix I_DIO_WAKEUP definition
  direct-io: only inc/dec inode->i_dio_count for file systems
  fs/9p: fix readdir()
  VFS: assorted d_backing_inode() annotations
  VFS: fs/inode.c helpers: d_inode() annotations
  VFS: fs/cachefiles: d_backing_inode() annotations
  VFS: fs library helpers: d_inode() annotations
  VFS: assorted weird filesystems: d_inode() annotations
  VFS: normal filesystems (and lustre): d_inode() annotations
  VFS: security/: d_inode() annotations
  VFS: security/: d_backing_inode() annotations
  VFS: net/: d_inode() annotations
  VFS: net/unix: d_backing_inode() annotations
  VFS: kernel/: d_inode() annotations
  VFS: audit: d_backing_inode() annotations
  VFS: Fix up some ->d_inode accesses in the chelsio driver
  VFS: Cachefiles should perform fs modifications on the top layer only
  VFS: AF_UNIX sockets should call mknod on the top layer only

1 files changed, 3 insertions, 3 deletions

diff --git a/fs/cachefiles/security.c b/fs/cachefiles/security.c
index 396c18ea2764..31bbc0528b11 100644
--- a/fs/cachefiles/security.c
+++ b/fs/cachefiles/security.c
@@ -55,14 +55,14 @@ static int cachefiles_check_cache_dir(struct cachefiles_cache *cache,
 {
         int ret;
 
-        ret = security_inode_mkdir(root->d_inode, root, 0);
+        ret = security_inode_mkdir(d_backing_inode(root), root, 0);
         if (ret < 0) {
                 pr_err("Security denies permission to make dirs: error %d",
                        ret);
                 return ret;
         }
 
-        ret = security_inode_create(root->d_inode, root, 0);
+        ret = security_inode_create(d_backing_inode(root), root, 0);
         if (ret < 0)
                 pr_err("Security denies permission to create files: error %d",
                        ret);
@@ -95,7 +95,7 @@ int cachefiles_determine_cache_security(struct cachefiles_cache *cache,
 
         /* use the cache root dir's security context as the basis with
          * which create files */
-        ret = set_create_files_as(new, root->d_inode);
+        ret = set_create_files_as(new, d_backing_inode(root));
         if (ret < 0) {
                 abort_creds(new);
                 cachefiles_begin_secure(cache, _saved_cred);