oprofile: don't bother with passing superblock to ->create_files()

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

1 files changed, 17 insertions, 18 deletions

diff --git a/arch/s390/oprofile/init.c b/arch/s390/oprofile/init.c
index 930783d2c99b..712d57bb783a 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->d_sb, root, "timer");
         if (!dir)
                 return -EINVAL;
 
-        oprofilefs_create_file(sb, dir, "enabled", &timer_enabled_fops);
+        oprofilefs_create_file(root->d_sb, 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->d_sb, 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(root->d_sb, dir, "enabled", &hwsampler_fops);
+                oprofilefs_create_file(root->d_sb, dir, "event", &zero_fops);
+                oprofilefs_create_file(root->d_sb, dir, "count", &hw_interval_fops);
+                oprofilefs_create_file(root->d_sb, dir, "unit_mask", &zero_fops);
+                oprofilefs_create_file(root->d_sb, dir, "kernel", &kernel_fops);
+                oprofilefs_create_file(root->d_sb, dir, "user", &user_fops);
+                oprofilefs_create_ulong(root->d_sb, 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->d_sb, root, "hwsampling");
                 if (!dir)
                         return -EINVAL;
 
-                oprofilefs_create_file(sb, dir, "hwsampler",
+                oprofilefs_create_file(root->d_sb, dir, "hwsampler",
                                        &hwsampler_fops);
-                oprofilefs_create_file(sb, dir, "hw_interval",
+                oprofilefs_create_file(root->d_sb, dir, "hw_interval",
                                        &hw_interval_fops);
-                oprofilefs_create_ro_ulong(sb, dir, "hw_min_interval",
+                oprofilefs_create_ro_ulong(root->d_sb, dir, "hw_min_interval",
                                            &oprofile_min_interval);
-                oprofilefs_create_ro_ulong(sb, dir, "hw_max_interval",
+                oprofilefs_create_ro_ulong(root->d_sb, dir, "hw_max_interval",
                                            &oprofile_max_interval);
-                oprofilefs_create_ulong(sb, dir, "hw_sdbt_blocks",
+                oprofilefs_create_ulong(root->d_sb, dir, "hw_sdbt_blocks",
                                         &oprofile_sdbt_blocks);
         }
         return 0;