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

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

10 files changed, 91 insertions, 93 deletions

diff --git a/arch/alpha/oprofile/common.c b/arch/alpha/oprofile/common.c
index b8ce18f485d3..d79bf68caee2 100644
--- a/arch/alpha/oprofile/common.c
+++ b/arch/alpha/oprofile/common.c
@@ -106,7 +106,7 @@ op_axp_stop(void)
 }
 
 static int
-op_axp_create_files(struct super_block *sb, struct dentry *root)
+op_axp_create_files(struct dentry *root)
 {
         int i;
 
@@ -115,23 +115,23 @@ op_axp_create_files(struct super_block *sb, struct dentry *root)
                 char buf[4];
 
                 snprintf(buf, sizeof buf, "%d", i);
-                dir = oprofilefs_mkdir(sb, root, buf);
+                dir = oprofilefs_mkdir(root->d_sb, root, buf);
 
-                oprofilefs_create_ulong(sb, dir, "enabled", &ctr[i].enabled);
-                oprofilefs_create_ulong(sb, dir, "event", &ctr[i].event);
-                oprofilefs_create_ulong(sb, dir, "count", &ctr[i].count);
+                oprofilefs_create_ulong(root->d_sb, dir, "enabled", &ctr[i].enabled);
+                oprofilefs_create_ulong(root->d_sb, dir, "event", &ctr[i].event);
+                oprofilefs_create_ulong(root->d_sb, dir, "count", &ctr[i].count);
                 /* Dummies.  */
-                oprofilefs_create_ulong(sb, dir, "kernel", &ctr[i].kernel);
-                oprofilefs_create_ulong(sb, dir, "user", &ctr[i].user);
-                oprofilefs_create_ulong(sb, dir, "unit_mask", &ctr[i].unit_mask);
+                oprofilefs_create_ulong(root->d_sb, dir, "kernel", &ctr[i].kernel);
+                oprofilefs_create_ulong(root->d_sb, dir, "user", &ctr[i].user);
+                oprofilefs_create_ulong(root->d_sb, dir, "unit_mask", &ctr[i].unit_mask);
         }
 
         if (model->can_set_proc_mode) {
-                oprofilefs_create_ulong(sb, root, "enable_pal",
+                oprofilefs_create_ulong(root->d_sb, root, "enable_pal",
                                         &sys.enable_pal);
-                oprofilefs_create_ulong(sb, root, "enable_kernel",
+                oprofilefs_create_ulong(root->d_sb, root, "enable_kernel",
                                         &sys.enable_kernel);
-                oprofilefs_create_ulong(sb, root, "enable_user",
+                oprofilefs_create_ulong(root->d_sb, root, "enable_user",
                                         &sys.enable_user);
         }
 
diff --git a/arch/avr32/oprofile/op_model_avr32.c b/arch/avr32/oprofile/op_model_avr32.c
index f74b7809e089..80a06158da82 100644
--- a/arch/avr32/oprofile/op_model_avr32.c
+++ b/arch/avr32/oprofile/op_model_avr32.c
@@ -97,8 +97,7 @@ static irqreturn_t avr32_perf_counter_interrupt(int irq, void *dev_id)
         return IRQ_HANDLED;
 }
 
-static int avr32_perf_counter_create_files(struct super_block *sb,
-                struct dentry *root)
+static int avr32_perf_counter_create_files(struct dentry *root)
 {
         struct dentry *dir;
         unsigned int i;
@@ -106,21 +105,21 @@ static int avr32_perf_counter_create_files(struct super_block *sb,
 
         for (i = 0; i < NR_counter; i++) {
                 snprintf(filename, sizeof(filename), "%u", i);
-                dir = oprofilefs_mkdir(sb, root, filename);
+                dir = oprofilefs_mkdir(root->d_sb, root, filename);
 
-                oprofilefs_create_ulong(sb, dir, "enabled",
+                oprofilefs_create_ulong(root->d_sb, dir, "enabled",
                                 &counter[i].enabled);
-                oprofilefs_create_ulong(sb, dir, "event",
+                oprofilefs_create_ulong(root->d_sb, dir, "event",
                                 &counter[i].event);
-                oprofilefs_create_ulong(sb, dir, "count",
+                oprofilefs_create_ulong(root->d_sb, dir, "count",
                                 &counter[i].count);
 
                 /* Dummy entries */
-                oprofilefs_create_ulong(sb, dir, "kernel",
+                oprofilefs_create_ulong(root->d_sb, dir, "kernel",
                                 &counter[i].kernel);
-                oprofilefs_create_ulong(sb, dir, "user",
+                oprofilefs_create_ulong(root->d_sb, dir, "user",
                                 &counter[i].user);
-                oprofilefs_create_ulong(sb, dir, "unit_mask",
+                oprofilefs_create_ulong(root->d_sb, dir, "unit_mask",
                                 &counter[i].unit_mask);
         }
 
diff --git a/arch/mips/oprofile/common.c b/arch/mips/oprofile/common.c
index af763e838fdd..7439ae2df05c 100644
--- a/arch/mips/oprofile/common.c
+++ b/arch/mips/oprofile/common.c
@@ -33,7 +33,7 @@ static int op_mips_setup(void)
         return 0;
 }
 
-static int op_mips_create_files(struct super_block *sb, struct dentry *root)
+static int op_mips_create_files(struct dentry *root)
 {
         int i;
 
@@ -42,16 +42,16 @@ static int op_mips_create_files(struct super_block *sb, struct dentry *root)
                 char buf[4];
 
                 snprintf(buf, sizeof buf, "%d", i);
-                dir = oprofilefs_mkdir(sb, root, buf);
-
-                oprofilefs_create_ulong(sb, dir, "enabled", &ctr[i].enabled);
-                oprofilefs_create_ulong(sb, dir, "event", &ctr[i].event);
-                oprofilefs_create_ulong(sb, dir, "count", &ctr[i].count);
-                oprofilefs_create_ulong(sb, dir, "kernel", &ctr[i].kernel);
-                oprofilefs_create_ulong(sb, dir, "user", &ctr[i].user);
-                oprofilefs_create_ulong(sb, dir, "exl", &ctr[i].exl);
+                dir = oprofilefs_mkdir(root->d_sb, root, buf);
+
+                oprofilefs_create_ulong(root->d_sb, dir, "enabled", &ctr[i].enabled);
+                oprofilefs_create_ulong(root->d_sb, dir, "event", &ctr[i].event);
+                oprofilefs_create_ulong(root->d_sb, dir, "count", &ctr[i].count);
+                oprofilefs_create_ulong(root->d_sb, dir, "kernel", &ctr[i].kernel);
+                oprofilefs_create_ulong(root->d_sb, dir, "user", &ctr[i].user);
+                oprofilefs_create_ulong(root->d_sb, dir, "exl", &ctr[i].exl);
                 /* Dummy.  */
-                oprofilefs_create_ulong(sb, dir, "unit_mask", &ctr[i].unit_mask);
+                oprofilefs_create_ulong(root->d_sb, dir, "unit_mask", &ctr[i].unit_mask);
         }
 
         return 0;
diff --git a/arch/powerpc/oprofile/common.c b/arch/powerpc/oprofile/common.c
index 4f51025f5b00..addc62317f45 100644
--- a/arch/powerpc/oprofile/common.c
+++ b/arch/powerpc/oprofile/common.c
@@ -119,7 +119,7 @@ static void op_powerpc_stop(void)
                 model->global_stop();
 }
 
-static int op_powerpc_create_files(struct super_block *sb, struct dentry *root)
+static int op_powerpc_create_files(struct dentry *root)
 {
         int i;
 
@@ -128,9 +128,9 @@ static int op_powerpc_create_files(struct super_block *sb, struct dentry *root)
          * There is one mmcr0, mmcr1 and mmcra for setting the events for
          * all of the counters.
          */
-        oprofilefs_create_ulong(sb, root, "mmcr0", &sys.mmcr0);
-        oprofilefs_create_ulong(sb, root, "mmcr1", &sys.mmcr1);
-        oprofilefs_create_ulong(sb, root, "mmcra", &sys.mmcra);
+        oprofilefs_create_ulong(root->d_sb, root, "mmcr0", &sys.mmcr0);
+        oprofilefs_create_ulong(root->d_sb, root, "mmcr1", &sys.mmcr1);
+        oprofilefs_create_ulong(root->d_sb, root, "mmcra", &sys.mmcra);
 #ifdef CONFIG_OPROFILE_CELL
         /* create a file the user tool can check to see what level of profiling
          * support exits with this kernel. Initialize bit mask to indicate
@@ -142,7 +142,7 @@ static int op_powerpc_create_files(struct super_block *sb, struct dentry *root)
          * If the file does not exist, then the kernel only supports SPU
          * cycle profiling, PPU event and cycle profiling.
          */