Merge branch 'debugfs_automount' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

Pull debugfs patches from Al Viro:
 "debugfs patches, mostly to make it possible for something like tracefs
  to be transparently automounted on given directory in debugfs.

  New primitive in there is debugfs_create_automount(name, parent, func,
  arg), which creates a directory and makes its ->d_automount() return
  func(arg).  Another missing primitive was debugfs_create_file_size() -
  open-coded in quite a few places.  Dave's patch adds it and converts
  the open-code instances to calling it"

* 'debugfs_automount' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  debugfs: Provide a file creation function that also takes an initial size
  new primitive: debugfs_create_automount()
  debugfs: split end_creating() into success and failure cases
  debugfs: take mode-dependent parts of debugfs_get_inode() into callers
  fold debugfs_mknod() into callers
  fold debugfs_create() into caller
  fold debugfs_mkdir() into caller
  debugfs_mknod(): get rid useless arguments
  fold debugfs_link() into caller
  debugfs: kill __create_file()
  debugfs: split the beginning and the end of __create_file() off
  debugfs_{mkdir,create,link}(): get rid of redundant argument

1 files changed, 11 insertions, 24 deletions

diff --git a/drivers/infiniband/hw/cxgb4/device.c b/drivers/infiniband/hw/cxgb4/device.c
index aafdbcd84fc4..8fb295e4a9ab 100644
--- a/drivers/infiniband/hw/cxgb4/device.c
+++ b/drivers/infiniband/hw/cxgb4/device.c
@@ -700,37 +700,24 @@ static const struct file_operations ep_debugfs_fops = {
 
 static int setup_debugfs(struct c4iw_dev *devp)
 {
-        struct dentry *de;
-
         if (!devp->debugfs_root)
                 return -1;
 
-        de = debugfs_create_file("qps", S_IWUSR, devp->debugfs_root,
-                                 (void *)devp, &qp_debugfs_fops);
-        if (de && de->d_inode)
-                de->d_inode->i_size = 4096;
+        debugfs_create_file_size("qps", S_IWUSR, devp->debugfs_root,
+                                 (void *)devp, &qp_debugfs_fops, 4096);
 
-        de = debugfs_create_file("stags", S_IWUSR, devp->debugfs_root,
-                                 (void *)devp, &stag_debugfs_fops);
-        if (de && de->d_inode)
-                de->d_inode->i_size = 4096;
+        debugfs_create_file_size("stags", S_IWUSR, devp->debugfs_root,
+                                 (void *)devp, &stag_debugfs_fops, 4096);
 
-        de = debugfs_create_file("stats", S_IWUSR, devp->debugfs_root,
-                        (void *)devp, &stats_debugfs_fops);
-        if (de && de->d_inode)
-                de->d_inode->i_size = 4096;
+        debugfs_create_file_size("stats", S_IWUSR, devp->debugfs_root,
+                                 (void *)devp, &stats_debugfs_fops, 4096);
 
-        de = debugfs_create_file("eps", S_IWUSR, devp->debugfs_root,
-                        (void *)devp, &ep_debugfs_fops);
-        if (de && de->d_inode)
-                de->d_inode->i_size = 4096;
+        debugfs_create_file_size("eps", S_IWUSR, devp->debugfs_root,
+                                 (void *)devp, &ep_debugfs_fops, 4096);
 
-        if (c4iw_wr_log) {
-                de = debugfs_create_file("wr_log", S_IWUSR, devp->debugfs_root,
-                                         (void *)devp, &wr_log_debugfs_fops);
-                if (de && de->d_inode)
-                        de->d_inode->i_size = 4096;
-        }
+        if (c4iw_wr_log)
+                debugfs_create_file_size("wr_log", S_IWUSR, devp->debugfs_root,
+                                         (void *)devp, &wr_log_debugfs_fops, 4096);
         return 0;
 }