Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

Pull vfs pile 1 from Al Viro:
 "Unfortunately, this merge window it'll have a be a lot of small piles -
  my fault, actually, for not keeping #for-next in anything that would
  resemble a sane shape ;-/

  This pile: assorted fixes (the first 3 are -stable fodder, IMO) and
  cleanups + %pd/%pD formats (dentry/file pathname, up to 4 last
  components) + several long-standing patches from various folks.

  There definitely will be a lot more (starting with Miklos'
  check_submount_and_drop() series)"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: (26 commits)
  direct-io: Handle O_(D)SYNC AIO
  direct-io: Implement generic deferred AIO completions
  add formats for dentry/file pathnames
  kvm eventfd: switch to fdget
  powerpc kvm: use fdget
  switch fchmod() to fdget
  switch epoll_ctl() to fdget
  switch copy_module_from_fd() to fdget
  git simplify nilfs check for busy subtree
  ibmasmfs: don't bother passing superblock when not needed
  don't pass superblock to hypfs_{mkdir,create*}
  don't pass superblock to hypfs_diag_create_files
  don't pass superblock to hypfs_vm_create_files()
  oprofile: get rid of pointless forward declarations of struct super_block
  oprofilefs_create_...() do not need superblock argument
  oprofilefs_mkdir() doesn't need superblock argument
  don't bother with passing superblock to oprofile_create_stats_files()
  oprofile: don't bother with passing superblock to ->create_files()
  don't bother passing sb to oprofile_create_files()
  coh901318: don't open-code simple_read_from_buffer()
  ...

5 files changed, 93 insertions, 106 deletions

diff --git a/arch/s390/hypfs/hypfs.h b/arch/s390/hypfs/hypfs.h
index f41e0ef7fdf9..79f2ac55253f 100644
--- a/arch/s390/hypfs/hypfs.h
+++ b/arch/s390/hypfs/hypfs.h
@@ -18,26 +18,23 @@
 #define UPDATE_FILE_MODE 0220
 #define DIR_MODE         0550
 
-extern struct dentry *hypfs_mkdir(struct super_block *sb, struct dentry *parent,
-                                  const char *name);
+extern struct dentry *hypfs_mkdir(struct dentry *parent, const char *name);
 
-extern struct dentry *hypfs_create_u64(struct super_block *sb,
-                                       struct dentry *dir, const char *name,
+extern struct dentry *hypfs_create_u64(struct dentry *dir, const char *name,
                                        __u64 value);
 
-extern struct dentry *hypfs_create_str(struct super_block *sb,
-                                       struct dentry *dir, const char *name,
+extern struct dentry *hypfs_create_str(struct dentry *dir, const char *name,
                                        char *string);
 
 /* LPAR Hypervisor */
 extern int hypfs_diag_init(void);
 extern void hypfs_diag_exit(void);
-extern int hypfs_diag_create_files(struct super_block *sb, struct dentry *root);
+extern int hypfs_diag_create_files(struct dentry *root);
 
 /* VM Hypervisor */
 extern int hypfs_vm_init(void);
 extern void hypfs_vm_exit(void);
-extern int hypfs_vm_create_files(struct super_block *sb, struct dentry *root);
+extern int hypfs_vm_create_files(struct dentry *root);
 
 /* debugfs interface */
 struct hypfs_dbfs_file;
diff --git a/arch/s390/hypfs/hypfs_diag.c b/arch/s390/hypfs/hypfs_diag.c
index 138893e5f736..5eeffeefae06 100644
--- a/arch/s390/hypfs/hypfs_diag.c
+++ b/arch/s390/hypfs/hypfs_diag.c
@@ -623,8 +623,7 @@ void hypfs_diag_exit(void)
  * *******************************************
  */
 
-static int hypfs_create_cpu_files(struct super_block *sb,
-                                  struct dentry *cpus_dir, void *cpu_info)
+static int hypfs_create_cpu_files(struct dentry *cpus_dir, void *cpu_info)
 {
         struct dentry *cpu_dir;
         char buffer[TMP_SIZE];
@@ -632,30 +631,29 @@ static int hypfs_create_cpu_files(struct super_block *sb,
 
         snprintf(buffer, TMP_SIZE, "%d", cpu_info__cpu_addr(diag204_info_type,
                                                             cpu_info));
-        cpu_dir = hypfs_mkdir(sb, cpus_dir, buffer);
-        rc = hypfs_create_u64(sb, cpu_dir, "mgmtime",
+        cpu_dir = hypfs_mkdir(cpus_dir, buffer);
+        rc = hypfs_create_u64(cpu_dir, "mgmtime",
                               cpu_info__acc_time(diag204_info_type, cpu_info) -
                               cpu_info__lp_time(diag204_info_type, cpu_info));
         if (IS_ERR(rc))
                 return PTR_ERR(rc);
-        rc = hypfs_create_u64(sb, cpu_dir, "cputime",
+        rc = hypfs_create_u64(cpu_dir, "cputime",
                               cpu_info__lp_time(diag204_info_type, cpu_info));
         if (IS_ERR(rc))
                 return PTR_ERR(rc);
         if (diag204_info_type == INFO_EXT) {
-                rc = hypfs_create_u64(sb, cpu_dir, "onlinetime",
+                rc = hypfs_create_u64(cpu_dir, "onlinetime",
                                       cpu_info__online_time(diag204_info_type,
                                                             cpu_info));
                 if (IS_ERR(rc))
                         return PTR_ERR(rc);
         }
         diag224_idx2name(cpu_info__ctidx(diag204_info_type, cpu_info), buffer);
-        rc = hypfs_create_str(sb, cpu_dir, "type", buffer);
+        rc = hypfs_create_str(cpu_dir, "type", buffer);
         return PTR_RET(rc);
 }
 
-static void *hypfs_create_lpar_files(struct super_block *sb,
-                                     struct dentry *systems_dir, void *part_hdr)
+static void *hypfs_create_lpar_files(struct dentry *systems_dir, void *part_hdr)
 {
         struct dentry *cpus_dir;
         struct dentry *lpar_dir;
@@ -665,16 +663,16 @@ static void *hypfs_create_lpar_files(struct super_block *sb,
 
         part_hdr__part_name(diag204_info_type, part_hdr, lpar_name);
         lpar_name[LPAR_NAME_LEN] = 0;
-        lpar_dir = hypfs_mkdir(sb, systems_dir, lpar_name);
+        lpar_dir = hypfs_mkdir(systems_dir, lpar_name);
         if (IS_ERR(lpar_dir))
                 return lpar_dir;
-        cpus_dir = hypfs_mkdir(sb, lpar_dir, "cpus");
+        cpus_dir = hypfs_mkdir(lpar_dir, "cpus");
         if (IS_ERR(cpus_dir))
                 return cpus_dir;
         cpu_info = part_hdr + part_hdr__size(diag204_info_type);
         for (i = 0; i < part_hdr__rcpus(diag204_info_type, part_hdr); i++) {
                 int rc;
-                rc = hypfs_create_cpu_files(sb, cpus_dir, cpu_info);
+                rc = hypfs_create_cpu_files(cpus_dir, cpu_info);
                 if (rc)
                         return ERR_PTR(rc);
                 cpu_info += cpu_info__size(diag204_info_type);
@@ -682,8 +680,7 @@ static void *hypfs_create_lpar_files(struct super_block *sb,
         return cpu_info;
 }
 
-static int hypfs_create_phys_cpu_files(struct super_block *sb,
-                                       struct dentry *cpus_dir, void *cpu_info)
+static int hypfs_create_phys_cpu_files(struct dentry *cpus_dir, void *cpu_info)
 {
         struct dentry *cpu_dir;
         char buffer[TMP_SIZE];
@@ -691,32 +688,31 @@ static int hypfs_create_phys_cpu_files(struct super_block *sb,
 
         snprintf(buffer, TMP_SIZE, "%i", phys_cpu__cpu_addr(diag204_info_type,
                                                             cpu_info));
-        cpu_dir = hypfs_mkdir(sb, cpus_dir, buffer);
+        cpu_dir = hypfs_mkdir(cpus_dir, buffer);
         if (IS_ERR(cpu_dir))
                 return PTR_ERR(cpu_dir);
-        rc = hypfs_create_u64(sb, cpu_dir, "mgmtime",
+        rc = hypfs_create_u64(cpu_dir, "mgmtime",
                               phys_cpu__mgm_time(diag204_info_type, cpu_info));
         if (IS_ERR(rc))
                 return PTR_ERR(rc);
         diag224_idx2name(phys_cpu__ctidx(diag204_info_type, cpu_info), buffer);
-        rc = hypfs_create_str(sb, cpu_dir, "type", buffer);
+        rc = hypfs_create_str(cpu_dir, "type", buffer);
         return PTR_RET(rc);
 }
 
-static void *hypfs_create_phys_files(struct super_block *sb,
-                                     struct dentry *parent_dir, void *phys_hdr)
+static void *hypfs_create_phys_files(struct dentry *parent_dir, void *phys_hdr)
 {
         int i;
         void *cpu_info;
         struct dentry *cpus_dir;
 
-        cpus_dir = hypfs_mkdir(sb, parent_dir, "cpus");
+        cpus_dir = hypfs_mkdir(parent_dir, "cpus");
         if (IS_ERR(cpus_dir))
                 return cpus_dir;
         cpu_info = phys_hdr + phys_hdr__size(diag204_info_type);
         for (i = 0; i < phys_hdr__cpus(diag204_info_type, phys_hdr); i++) {
                 int rc;
-                rc = hypfs_create_phys_cpu_files(sb, cpus_dir, cpu_info);
+                rc = hypfs_create_phys_cpu_files(cpus_dir, cpu_info);
                 if (rc)
                         return ERR_PTR(rc);
                 cpu_info += phys_cpu__size(diag204_info_type);
@@ -724,7 +720,7 @@ static void *hypfs_create_phys_files(struct super_block *sb,
         return cpu_info;
 }
 
-int hypfs_diag_create_files(struct super_block *sb, struct dentry *root)
+int hypfs_diag_create_files(struct dentry *root)
 {
         struct dentry *systems_dir, *hyp_dir;
         void *time_hdr, *part_hdr;
@@ -735,7 +731,7 @@ int hypfs_diag_create_files(struct super_block *sb, struct dentry *root)
         if (IS_ERR(buffer))
                 return PTR_ERR(buffer);
 
-        systems_dir = hypfs_mkdir(sb, root, "systems");
+        systems_dir = hypfs_mkdir(root, "systems");
         if (IS_ERR(systems_dir)) {
                 rc = PTR_ERR(systems_dir);
                 goto err_out;
@@ -743,25 +739,25 @@ int hypfs_diag_create_files(struct super_block *sb, struct dentry *root)
         time_hdr = (struct x_info_blk_hdr *)buffer;
         part_hdr = time_hdr + info_blk_hdr__size(diag204_info_type);
         for (i = 0; i < info_blk_hdr__npar(diag204_info_type, time_hdr); i++) {
-                part_hdr = hypfs_create_lpar_files(sb, systems_dir, part_hdr);
+                part_hdr = hypfs_create_lpar_files(systems_dir, part_hdr);
                 if (IS_ERR(part_hdr)) {
                         rc = PTR_ERR(part_hdr);
                         goto err_out;
                 }
         }
         if (info_blk_hdr__flags(diag204_info_type, time_hdr) & LPAR_PHYS_FLG) {
-                ptr = hypfs_create_phys_files(sb, root, part_hdr);
+                ptr = hypfs_create_phys_files(root, part_hdr);
                 if (IS_ERR(ptr)) {
                         rc = PTR_ERR(ptr);
                         goto err_out;
                 }
         }
-        hyp_dir = hypfs_mkdir(sb, root, "hyp");
+        hyp_dir = hypfs_mkdir(root, "hyp");
         if (IS_ERR(hyp_dir)) {
                 rc = PTR_ERR(hyp_dir);
                 goto err_out;
         }
-        ptr = hypfs_create_str(sb, hyp_dir, "type", "LPAR Hypervisor");
+        ptr = hypfs_create_str(hyp_dir, "type", "LPAR Hypervisor");
         if (IS_ERR(ptr)) {
                 rc = PTR_ERR(ptr);
                 goto err_out;
diff --git a/arch/s390/hypfs/hypfs_vm.c b/arch/s390/hypfs/hypfs_vm.c
index f364dcf77e8e..24908ce149f1 100644
--- a/arch/s390/hypfs/hypfs_vm.c
+++ b/arch/s390/hypfs/hypfs_vm.c
@@ -107,16 +107,15 @@ static void diag2fc_free(const void *data)
         vfree(data);
 }
 
-#define ATTRIBUTE(sb, dir, name, member) \
+#define ATTRIBUTE(dir, name, member) \
 do { \
         void *rc; \
-        rc = hypfs_create_u64(sb, dir, name, member); \
+        rc = hypfs_create_u64(dir, name, member); \
         if (IS_ERR(rc)) \
                 return PTR_ERR(rc); \
 } while(0)
 
-static int hpyfs_vm_create_guest(struct super_block *sb,
-                                 struct dentry *systems_dir,
+static int hpyfs_vm_create_guest(struct dentry *systems_dir,
                                  struct diag2fc_data *data)
 {
         char guest_name[NAME_LEN + 1] = {};
@@ -130,46 +129,46 @@ static int hpyfs_vm_create_guest(struct super_block *sb,
         memcpy(guest_name, data->guest_name, NAME_LEN);
         EBCASC(guest_name, NAME_LEN);
         strim(guest_name);
-        guest_dir = hypfs_mkdir(sb, systems_dir, guest_name);
+        guest_dir = hypfs_mkdir(systems_dir, guest_name);
         if (IS_ERR(guest_dir))
                 return PTR_ERR(guest_dir);
-        ATTRIBUTE(sb, guest_dir, "onlinetime_us", data->el_time);
+        ATTRIBUTE(guest_dir, "onlinetime_us", data->el_time);
 
         /* logical cpu information */
-        cpus_dir = hypfs_mkdir(sb, guest_dir, "cpus");
+        cpus_dir = hypfs_mkdir(guest_dir, "cpus");
         if (IS_ERR(cpus_dir))
                 return PTR_ERR(cpus_dir);
-        ATTRIBUTE(sb, cpus_dir, "cputime_us", data->used_cpu);
-        ATTRIBUTE(sb, cpus_dir, "capped", capped_value);
-        ATTRIBUTE(sb, cpus_dir, "dedicated", dedicated_flag);
-        ATTRIBUTE(sb, cpus_dir, "count", data->vcpus);
-        ATTRIBUTE(sb, cpus_dir, "weight_min", data->cpu_min);
-        ATTRIBUTE(sb, cpus_dir, "weight_max", data->cpu_max);
-        ATTRIBUTE(sb, cpus_dir, "weight_cur", data->cpu_shares);
+        ATTRIBUTE(cpus_dir, "cputime_us", data->used_cpu);
+        ATTRIBUTE(cpus_dir, "capped", capped_value);
+        ATTRIBUTE(cpus_dir, "dedicated", dedicated_flag);
+        ATTRIBUTE(cpus_dir, "count", data->vcpus);
+        ATTRIBUTE(cpus_dir, "weight_min", data->cpu_min);
+        ATTRIBUTE(cpus_dir, "weight_max", data->cpu_max);
+        ATTRIBUTE(cpus_dir, "weight_cur", data->cpu_shares);
 
         /* memory information */
-        mem_dir = hypfs_mkdir(sb, guest_dir, "mem");
+        mem_dir = hypfs_mkdir(guest_dir, "mem");
         if (IS_ERR(mem_dir))
                 return PTR_ERR(mem_dir);
-        ATTRIBUTE(sb, mem_dir, "min_KiB", data->mem_min_kb);
-        ATTRIBUTE(sb, mem_dir, "max_KiB", data->mem_max_kb);
-        ATTRIBUTE(sb, mem_dir, "used_KiB", data->mem_used_kb);
-        ATTRIBUTE(sb, mem_dir, "share_KiB", data->mem_share_kb);
+        ATTRIBUTE(mem_dir, "min_KiB", data->mem_min_kb);
+        ATTRIBUTE(mem_dir, "max_KiB", data->mem_max_kb);
+        ATTRIBUTE(mem_dir, "used_KiB", data->mem_used_kb);
+        ATTRIBUTE(mem_dir, "share_KiB", data->mem_share_kb);
 
         /* samples */
-        samples_dir = hypfs_mkdir(sb, guest_dir, "samples");
+        samples_dir = hypfs_mkdir(guest_dir, "samples");
         if (IS_ERR(samples_dir))
                 return PTR_ERR(samples_dir);
-        ATTRIBUTE(sb, samples_dir, "cpu_using", data->cpu_use_samp);
-        ATTRIBUTE(sb, samples_dir, "cpu_delay", data->cpu_delay_samp);
-        ATTRIBUTE(sb, samples_dir, "mem_delay", data->page_wait_samp);
-        ATTRIBUTE(sb, samples_dir, "idle", data->idle_samp);
-        ATTRIBUTE(sb, samples_dir, "other", data->other_samp);
-        ATTRIBUTE(sb, samples_dir, "total", data->total_samp);
+        ATTRIBUTE(samples_dir, "cpu_using", data->cpu_use_samp);
+        ATTRIBUTE(samples_dir, "cpu_delay", data->cpu_delay_samp);
+        ATTRIBUTE(samples_dir, "mem_delay", data->page_wait_samp);
+        ATTRIBUTE(samples_dir, "idle", data->idle_samp);
+        ATTRIBUTE(samples_dir, "other", data->other_samp);
+        ATTRIBUTE(samples_dir, "total", data->total_samp);
         return 0;
 }
 
-int hypfs_vm_create_files(struct super_block *sb, struct dentry *root)
+int hypfs_vm_create_files(struct dentry *root)
 {
         struct dentry *dir, *file;
         struct diag2fc_data *data;
@@ -181,38 +180,38 @@ int hypfs_vm_create_files(struct super_block *sb, struct dentry *root)
                 return PTR_ERR(data);
 
         /* Hpervisor Info */
-        dir = hypfs_mkdir(sb, root, "hyp");
+        dir = hypfs_mkdir(root, "hyp");
         if (IS_ERR(dir)) {
                 rc = PTR_ERR(dir);
                 goto failed;
         }
-        file = hypfs_create_str(sb, dir, "type", "z/VM Hypervisor");
+        file = hypfs_create_str(dir, "type", "z/VM Hypervisor");
         if (IS_ERR(file)) {
                 rc = PTR_ERR(file);
                 goto failed;
         }
 
         /* physical cpus */
-        dir = hypfs_mkdir(sb, root, "cpus");
+        dir = hypfs_mkdir(root, "cpus");
         if (IS_ERR(dir)) {
                 rc = PTR_ERR(dir);
                 goto failed;
         }
-        file = hypfs_create_u64(sb, dir, "count", data->lcpus);
+        file = hypfs_create_u64(dir, "count", data->lcpus);
         if (IS_ERR(file)) {
                 rc = PTR_ERR(file);
                 goto failed;
         }
 
         /* guests */
-        dir = hypfs_mkdir(sb, root, "systems");
+        dir = hypfs_mkdir(root, "systems");
         if (IS_ERR(dir)) {
                 rc = PTR_ERR(dir);
                 goto failed;
         }
 
         for (i = 0; i < count; i++) {
-                rc = hpyfs_vm_create_guest(sb, dir, &(data[i]));
+                rc = hpyfs_vm_create_guest(dir, &(data[i]));
                 if (rc)
                         goto failed;
         }
diff --git a/arch/s390/hypfs/inode.c b/arch/s390/hypfs/inode.c
index 7a539f4f5e30..ddfe09b45134 100644
--- a/arch/s390/hypfs/inode.c
+++ b/arch/s390/hypfs/inode.c
@@ -28,8 +28,7 @@
 #define HYPFS_MAGIC 0x687970    /* ASCII 'hyp' */
 #define TMP_SIZE 64             /* size of temporary buffers */
 
-static struct dentry *hypfs_create_update_file(struct super_block *sb,
-                                               struct dentry *dir);
+static struct dentry *hypfs_create_update_file(struct dentry *dir);
 
 struct hypfs_sb_info {
         kuid_t uid;                     /* uid used for files and dirs */
@@ -193,9 +192,9 @@ static ssize_t hypfs_aio_write(struct kiocb *iocb, const struct iovec *iov,
         }
         hypfs_delete_tree(sb->s_root);
         if (MACHINE_IS_VM)
-                rc = hypfs_vm_create_files(sb, sb->s_root);
+                rc = hypfs_vm_create_files(sb->s_root);
         else
-                rc = hypfs_diag_create_files(sb, sb->s_root);
+                rc = hypfs_diag_create_files(sb->s_root);
         if (rc) {
                 pr_err("Updating the hypfs tree failed\n");
                 hypfs_delete_tree(sb->s_root);
@@ -302,12 +301,12 @@ static int hypfs_fill_super(struct super_block *sb, void *data, int silent)
         if (!root_dentry)
                 return -ENOMEM;
         if (MACHINE_IS_VM)
-                rc = hypfs_vm_create_files(sb, root_dentry);
+                rc = hypfs_vm_create_files(root_dentry);
         else
-                rc = hypfs_diag_create_files(sb, root_dentry);
+                rc = hypfs_diag_create_files(root_dentry);
         if (rc)
                 return rc;
-        sbi->update_file = hypfs_create_update_file(sb, root_dentry);
+        sbi->update_file = hypfs_create_update_file(root_dentry);
         if (IS_ERR(sbi->update_file))
                 return PTR_ERR(sbi->update_file);
         hypfs_update_update(sb);
@@ -334,8 +333,7 @@ static void hypfs_kill_super(struct super_block *sb)
         kill_litter_super(sb);
 }
 
-static struct dentry *hypfs_create_file(struct super_block *sb,
-                                        struct dentry *parent, const char *name,
+static struct dentry *hypfs_create_file(struct dentry *parent, const char *name,
                                         char *data, umode_t mode)
 {
         struct dentry *dentry;
@@ -347,7 +345,7 @@ static struct dentry *hypfs_create_file(struct super_block *sb,
                 dentry = ERR_PTR(-ENOMEM);
                 goto fail;
         }
-        inode = hypfs_make_inode(sb, mode);
+        inode = hypfs_make_inode(parent->d_sb, mode);
         if (!inode) {
                 dput(dentry);
                 dentry = ERR_PTR(-ENOMEM);
@@ -373,24 +371,22 @@ fail:
         return dentry;
 }
 
-struct dentry *hypfs_mkdir(struct super_block *sb, struct dentry *parent,
-                           const char *name)
+struct dentry *hypfs_mkdir(struct dentry *parent, const char *name)
 {
         struct dentry *dentry;
 
-        dentry = hypfs_create_file(sb, parent, name, NULL, S_IFDIR | DIR_MODE);
+        dentry = hypfs_create_file(parent, name, NULL, S_IFDIR | DIR_MODE);
         if (IS_ERR(dentry))
                 return dentry;
         hypfs_add_dentry(dentry);
         return dentry;
 }
 
-static struct dentry *hypfs_create_update_file(struct super_block *sb,
-                                               struct dentry *dir)
+static struct dentry *hypfs_create_update_file(struct dentry *dir)
 {
         struct dentry *dentry;
 
-        dentry = hypfs_create_file(sb, dir, "update", NULL,
+        dentry = hypfs_create_file(dir, "update", NULL,
                                    S_IFREG | UPDATE_FILE_MODE);
         /*
          * We do not put the update file on the 'delete' list with
@@ -400,7 +396,7 @@ static struct dentry *hypfs_create_update_file(struct super_block *sb,
         return dentry;
 }
 
-struct dentry *hypfs_create_u64(struct super_block *sb, struct dentry *dir,
+struct dentry *hypfs_create_u64(struct dentry *dir,
                                 const char *name, __u64 value)
 {
         char *buffer;
@@ -412,7 +408,7 @@ struct dentry *hypfs_create_u64(struct super_block *sb, struct dentry *dir,
         if (!buffer)
                 return ERR_PTR(-ENOMEM);
         dentry =
-            hypfs_create_file(sb, dir, name, buffer, S_IFREG | REG_FILE_MODE);
+            hypfs_create_file(dir, name, buffer, S_IFREG | REG_FILE_MODE);
         if (IS_ERR(dentry)) {
                 kfree(buffer);
                 return ERR_PTR(-ENOMEM);
@@ -421,7 +417,7 @@ struct dentry *hypfs_create_u64(struct super_block *sb, struct dentry *dir,
         return dentry;
 }
 
-struct dentry *hypfs_create_str(struct super_block *sb, struct dentry *dir,
+struct dentry *hypfs_create_str(struct dentry *dir,
                                 const char *name, char *string)
 {
         char *buffer;
@@ -432,7 +428,7 @@ struct dentry *hypfs_create_str(struct super_block *sb, struct dentry *dir,
                 return ERR_PTR(-ENOMEM);
         sprintf(buffer, "%s\n", string);
         dentry =
-            hypfs_create_file(sb, dir, name, buffer, S_IFREG | REG_FILE_MODE);
+            hypfs_create_file(dir, name, buffer, S_IFREG | REG_FILE_MODE);
         if (IS_ERR(dentry)) {
                 kfree(buffer);
                 return ERR_PTR(-ENOMEM);
diff --git a/arch/s390/oprofile/init.c b/arch/s390/oprofile/init.c
index 930783d2c99b..04e1b6a85362 100644
--- a/arch/s390/oprofile/init.c
+++ b/arch/s390/oprofile/init.c
@@ -346,16 +346,15 @@ static const struct file_operations timer_enabled_fops = {
 };
 
 
-static int oprofile_create_hwsampling_files(struct super_block *sb,
-                                            struct dentry *root)
+static int oprofile_create_hwsampling_files(struct dentry *root)
 {
         struct dentry *dir;
 
-        dir = oprofilefs_mkdir(sb, root, "timer");
+        dir = oprofilefs_mkdir(root, "timer");
         if (!dir)
                 return -EINVAL;
 
-        oprofilefs_create_file(sb, dir, "enabled", &timer_enabled_fops);
+        oprofilefs_create_file(dir, "enabled", &timer_enabled_fops);
 
         if (!hwsampler_available)
                 return 0;
@@ -376,17 +375,17 @@ static int oprofile_create_hwsampling_files(struct super_block *sb,
                  * and can only be set to 0.
                  */
 
-                dir = oprofilefs_mkdir(sb, root, "0");
+                dir = oprofilefs_mkdir(root, "0");
                 if (!dir)
                         return -EINVAL;
 
-                oprofilefs_create_file(sb, dir, "enabled", &hwsampler_fops);
-                oprofilefs_create_file(sb, dir, "event", &zero_fops);
-                oprofilefs_create_file(sb, dir, "count", &hw_interval_fops);
-                oprofilefs_create_file(sb, dir, "unit_mask", &zero_fops);
-                oprofilefs_create_file(sb, dir, "kernel", &kernel_fops);
-                oprofilefs_create_file(sb, dir, "user", &user_fops);
-                oprofilefs_create_ulong(sb, dir, "hw_sdbt_blocks",
+                oprofilefs_create_file(dir, "enabled", &hwsampler_fops);
+                oprofilefs_create_file(dir, "event", &zero_fops);
+                oprofilefs_create_file(dir, "count", &hw_interval_fops);
+                oprofilefs_create_file(dir, "unit_mask", &zero_fops);
+                oprofilefs_create_file(dir, "kernel", &kernel_fops);
+                oprofilefs_create_file(dir, "user", &user_fops);
+                oprofilefs_create_ulong(dir, "hw_sdbt_blocks",
                                         &oprofile_sdbt_blocks);
 
         } else {
@@ -396,19 +395,19 @@ static int oprofile_create_hwsampling_files(struct super_block *sb,
                  * space tools.  The /dev/oprofile/hwsampling fs is
                  * provided in that case.
                  */
-                dir = oprofilefs_mkdir(sb, root, "hwsampling");
+                dir = oprofilefs_mkdir(root, "hwsampling");
                 if (!dir)
                         return -EINVAL;
 
-                oprofilefs_create_file(sb, dir, "hwsampler",
+                oprofilefs_create_file(dir, "hwsampler",
                                        &hwsampler_fops);
-                oprofilefs_create_file(sb, dir, "hw_interval",
+                oprofilefs_create_file(dir, "hw_interval",
                                        &hw_interval_fops);
-                oprofilefs_create_ro_ulong(sb, dir, "hw_min_interval",
+                oprofilefs_create_ro_ulong(dir, "hw_min_interval",
                                            &oprofile_min_interval);
-                oprofilefs_create_ro_ulong(sb, dir, "hw_max_interval",
+                oprofilefs_create_ro_ulong(dir, "hw_max_interval",
                                            &oprofile_max_interval);
-                oprofilefs_create_ulong(sb, dir, "hw_sdbt_blocks",
+                oprofilefs_create_ulong(dir, "hw_sdbt_blocks",
                                         &oprofile_sdbt_blocks);
         }
         return 0;