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, 8 insertions, 8 deletions

diff --git a/fs/binfmt_misc.c b/fs/binfmt_misc.c
index 9dcb05409ba7..78f005f37847 100644
--- a/fs/binfmt_misc.c
+++ b/fs/binfmt_misc.c
@@ -591,7 +591,7 @@ static void kill_node(Node *e)
         write_unlock(&entries_lock);
 
         if (dentry) {
-                drop_nlink(dentry->d_inode);
+                drop_nlink(d_inode(dentry));
                 d_drop(dentry);
                 dput(dentry);
                 simple_release_fs(&bm_mnt, &entry_count);
@@ -638,11 +638,11 @@ static ssize_t bm_entry_write(struct file *file, const char __user *buffer,
         case 3:
                 /* Delete this handler. */
                 root = dget(file->f_path.dentry->d_sb->s_root);
-                mutex_lock(&root->d_inode->i_mutex);
+                mutex_lock(&d_inode(root)->i_mutex);
 
                 kill_node(e);
 
-                mutex_unlock(&root->d_inode->i_mutex);
+                mutex_unlock(&d_inode(root)->i_mutex);
                 dput(root);
                 break;
         default:
@@ -675,14 +675,14 @@ static ssize_t bm_register_write(struct file *file, const char __user *buffer,
                 return PTR_ERR(e);
 
         root = dget(sb->s_root);
-        mutex_lock(&root->d_inode->i_mutex);
+        mutex_lock(&d_inode(root)->i_mutex);
         dentry = lookup_one_len(e->name, root, strlen(e->name));
         err = PTR_ERR(dentry);
         if (IS_ERR(dentry))
                 goto out;
 
         err = -EEXIST;
-        if (dentry->d_inode)
+        if (d_really_is_positive(dentry))
                 goto out2;
 
         inode = bm_get_inode(sb, S_IFREG | 0644);
@@ -711,7 +711,7 @@ static ssize_t bm_register_write(struct file *file, const char __user *buffer,
 out2:
         dput(dentry);
 out:
-        mutex_unlock(&root->d_inode->i_mutex);
+        mutex_unlock(&d_inode(root)->i_mutex);
         dput(root);
 
         if (err) {
@@ -754,12 +754,12 @@ static ssize_t bm_status_write(struct file *file, const char __user *buffer,
         case 3:
                 /* Delete all handlers. */
                 root = dget(file->f_path.dentry->d_sb->s_root);
-                mutex_lock(&root->d_inode->i_mutex);
+                mutex_lock(&d_inode(root)->i_mutex);
 
                 while (!list_empty(&entries))
                         kill_node(list_entry(entries.next, Node, list));
 
-                mutex_unlock(&root->d_inode->i_mutex);
+                mutex_unlock(&d_inode(root)->i_mutex);
                 dput(root);
                 break;
         default: