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/include/trace/events/ext4.h b/include/trace/events/ext4.h
index 47fca36ee426..08ec3dd27630 100644
--- a/include/trace/events/ext4.h
+++ b/include/trace/events/ext4.h
@@ -872,10 +872,10 @@ TRACE_EVENT(ext4_sync_file_enter,
         TP_fast_assign(
                 struct dentry *dentry = file->f_path.dentry;
 
-                __entry->dev            = dentry->d_inode->i_sb->s_dev;
-                __entry->ino            = dentry->d_inode->i_ino;
+                __entry->dev            = d_inode(dentry)->i_sb->s_dev;
+                __entry->ino            = d_inode(dentry)->i_ino;
                 __entry->datasync       = datasync;
-                __entry->parent         = dentry->d_parent->d_inode->i_ino;
+                __entry->parent         = d_inode(dentry->d_parent)->i_ino;
         ),
 
         TP_printk("dev %d,%d ino %lu parent %lu datasync %d ",
@@ -1453,10 +1453,10 @@ TRACE_EVENT(ext4_unlink_enter,
         ),
 
         TP_fast_assign(
-                __entry->dev            = dentry->d_inode->i_sb->s_dev;
-                __entry->ino            = dentry->d_inode->i_ino;
+                __entry->dev            = d_inode(dentry)->i_sb->s_dev;
+                __entry->ino            = d_inode(dentry)->i_ino;
                 __entry->parent         = parent->i_ino;
-                __entry->size           = dentry->d_inode->i_size;
+                __entry->size           = d_inode(dentry)->i_size;
         ),
 
         TP_printk("dev %d,%d ino %lu size %lld parent %lu",
@@ -1477,8 +1477,8 @@ TRACE_EVENT(ext4_unlink_exit,
         ),
 
         TP_fast_assign(
-                __entry->dev            = dentry->d_inode->i_sb->s_dev;
-                __entry->ino            = dentry->d_inode->i_ino;
+                __entry->dev            = d_inode(dentry)->i_sb->s_dev;
+                __entry->ino            = d_inode(dentry)->i_ino;
                 __entry->ret            = ret;
         ),