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

diff --git a/arch/powerpc/platforms/cell/spufs/inode.c b/arch/powerpc/platforms/cell/spufs/inode.c
index 1a3429e1ccb5..1ba6307be4db 100644
--- a/arch/powerpc/platforms/cell/spufs/inode.c
+++ b/arch/powerpc/platforms/cell/spufs/inode.c
@@ -111,7 +111,7 @@ out:
 static int
 spufs_setattr(struct dentry *dentry, struct iattr *attr)
 {
-        struct inode *inode = dentry->d_inode;
+        struct inode *inode = d_inode(dentry);
 
         if ((attr->ia_valid & ATTR_SIZE) &&
             (attr->ia_size != inode->i_size))
@@ -163,14 +163,14 @@ static void spufs_prune_dir(struct dentry *dir)
 {
         struct dentry *dentry, *tmp;
 
-        mutex_lock(&dir->d_inode->i_mutex);
+        mutex_lock(&d_inode(dir)->i_mutex);
         list_for_each_entry_safe(dentry, tmp, &dir->d_subdirs, d_child) {
                 spin_lock(&dentry->d_lock);
-                if (!(d_unhashed(dentry)) && dentry->d_inode) {
+                if (!(d_unhashed(dentry)) && d_really_is_positive(dentry)) {
                         dget_dlock(dentry);
                         __d_drop(dentry);
                         spin_unlock(&dentry->d_lock);
-                        simple_unlink(dir->d_inode, dentry);
+                        simple_unlink(d_inode(dir), dentry);
                         /* XXX: what was dcache_lock protecting here? Other
                          * filesystems (IB, configfs) release dcache_lock
                          * before unlink */
@@ -180,7 +180,7 @@ static void spufs_prune_dir(struct dentry *dir)
                 }
         }
         shrink_dcache_parent(dir);
-        mutex_unlock(&dir->d_inode->i_mutex);
+        mutex_unlock(&d_inode(dir)->i_mutex);
 }
 
 /* Caller must hold parent->i_mutex */
@@ -192,7 +192,7 @@ static int spufs_rmdir(struct inode *parent, struct dentry *dir)
         d_drop(dir);
         res = simple_rmdir(parent, dir);
         /* We have to give up the mm_struct */
-        spu_forget(SPUFS_I(dir->d_inode)->i_ctx);
+        spu_forget(SPUFS_I(d_inode(dir))->i_ctx);
         return res;
 }
 
@@ -222,8 +222,8 @@ static int spufs_dir_close(struct inode *inode, struct file *file)
         int ret;
 
         dir = file->f_path.dentry;
-        parent = dir->d_parent->d_inode;
-        ctx = SPUFS_I(dir->d_inode)->i_ctx;
+        parent = d_inode(dir->d_parent);
+        ctx = SPUFS_I(d_inode(dir))->i_ctx;
 
         mutex_lock_nested(&parent->i_mutex, I_MUTEX_PARENT);
         ret = spufs_rmdir(parent, dir);
@@ -460,7 +460,7 @@ spufs_create_context(struct inode *inode, struct dentry *dentry,
                 goto out_aff_unlock;
 
         if (affinity) {
-                spufs_set_affinity(flags, SPUFS_I(dentry->d_inode)->i_ctx,
+                spufs_set_affinity(flags, SPUFS_I(d_inode(dentry))->i_ctx,
                                                                 neighbor);
                 if (neighbor)
                         put_spu_context(neighbor);
@@ -504,7 +504,7 @@ spufs_mkgang(struct inode *dir, struct dentry *dentry, umode_t mode)
 
         d_instantiate(dentry, inode);
         inc_nlink(dir);
-        inc_nlink(dentry->d_inode);
+        inc_nlink(d_inode(dentry));
         return ret;
 
 out_iput:
@@ -561,7 +561,7 @@ static struct file_system_type spufs_type;
 long spufs_create(struct path *path, struct dentry *dentry,
                 unsigned int flags, umode_t mode, struct file *filp)
 {
-        struct inode *dir = path->dentry->d_inode;
+        struct inode *dir = d_inode(path->dentry);
         int ret;
 
         /* check if we are on spufs */