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

2 files changed, 7 insertions, 16 deletions

diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_debugfs.c b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_debugfs.c
index f0285bcbe598..371f75e782e5 100644
--- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_debugfs.c
+++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_debugfs.c
@@ -538,7 +538,7 @@ static ssize_t tp_la_write(struct file *file, const char __user *buf,
         char s[32];
         unsigned long val;
         size_t size = min(sizeof(s) - 1, count);
-        struct adapter *adap = FILE_DATA(file)->i_private;
+        struct adapter *adap = file_inode(file)->i_private;
 
         if (copy_from_user(s, buf, size))
                 return -EFAULT;
@@ -647,7 +647,7 @@ static int pm_stats_open(struct inode *inode, struct file *file)
 static ssize_t pm_stats_clear(struct file *file, const char __user *buf,
                               size_t count, loff_t *pos)
 {
-        struct adapter *adap = FILE_DATA(file)->i_private;
+        struct adapter *adap = file_inode(file)->i_private;
 
         t4_write_reg(adap, PM_RX_STAT_CONFIG_A, 0);
         t4_write_reg(adap, PM_TX_STAT_CONFIG_A, 0);
@@ -1005,7 +1005,7 @@ static ssize_t mbox_write(struct file *file, const char __user *buf,
                    &data[7], &c) < 8 || c != '\n')
                 return -EINVAL;
 
-        ino = FILE_DATA(file);
+        ino = file_inode(file);
         mbox = (uintptr_t)ino->i_private & 7;
         adap = ino->i_private - mbox;
         addr = adap->regs + PF_REG(mbox, CIM_PF_MAILBOX_DATA_A);
@@ -1034,7 +1034,7 @@ static ssize_t flash_read(struct file *file, char __user *buf, size_t count,
                           loff_t *ppos)
 {
         loff_t pos = *ppos;
-        loff_t avail = FILE_DATA(file)->i_size;
+        loff_t avail = file_inode(file)->i_size;
         struct adapter *adap = file->private_data;
 
         if (pos < 0)
@@ -1479,7 +1479,7 @@ static ssize_t rss_key_write(struct file *file, const char __user *buf,
         int i, j;
         u32 key[10];
         char s[100], *p;
-        struct adapter *adap = FILE_DATA(file)->i_private;
+        struct adapter *adap = file_inode(file)->i_private;
 
         if (count > sizeof(s) - 1)
                 return -EINVAL;
@@ -1951,12 +1951,6 @@ static const struct file_operations mem_debugfs_fops = {
         .llseek  = default_llseek,
 };
 
-static void set_debugfs_file_size(struct dentry *de, loff_t size)
-{
-        if (!IS_ERR(de) && de->d_inode)
-                de->d_inode->i_size = size;
-}
-
 static void add_debugfs_mem(struct adapter *adap, const char *name,
                             unsigned int idx, unsigned int size_mb)
 {
@@ -2072,9 +2066,8 @@ int t4_setup_debugfs(struct adapter *adap)
                 }
         }
 
-        de = debugfs_create_file("flash", S_IRUSR, adap->debugfs_root, adap,
-                                 &flash_debugfs_fops);
-        set_debugfs_file_size(de, adap->params.sf_size);
+        de = debugfs_create_file_size("flash", S_IRUSR, adap->debugfs_root, adap,
+                                      &flash_debugfs_fops, adap->params.sf_size);
 
         return 0;
 }
diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_debugfs.h b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_debugfs.h
index 8f418ba868bd..23f43a0f8950 100644
--- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_debugfs.h
+++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_debugfs.h
@@ -37,8 +37,6 @@
 
 #include <linux/export.h>
 
-#define FILE_DATA(_file) ((_file)->f_path.dentry->d_inode)
-
 #define DEFINE_SIMPLE_DEBUGFS_FILE(name) \
 static int name##_open(struct inode *inode, struct file *file) \
 { \