don't bother passing sb to oprofile_create_files()

it's always root->d_sb

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

diff --git a/drivers/oprofile/oprof.h b/drivers/oprofile/oprof.h
index d32ef816337c21189cdcfc53f5d6ddc57e1b0ed1..8c43f20ab5fa90926cad149c8539ad97e5bbff06 100644 (file)
--- a/drivers/oprofile/oprof.h
+++ b/drivers/oprofile/oprof.h
@@ -33,7 +33,7 @@ extern unsigned long oprofile_backtrace_depth;
 struct super_block;
 struct dentry;
 
-void oprofile_create_files(struct super_block *sb, struct dentry *root);
+void oprofile_create_files(struct dentry *root);
 int oprofile_timer_init(struct oprofile_operations *ops);
 #ifdef CONFIG_OPROFILE_NMI_TIMER
 int op_nmi_timer_init(struct oprofile_operations *ops);

diff --git a/drivers/oprofile/oprofile_files.c b/drivers/oprofile/oprofile_files.c
index 84a208dbed939afa20743804d8e4d75ca5ff741a..97c345ff62c49f799e572cb18dfb32eb891dfa53 100644 (file)
--- a/drivers/oprofile/oprofile_files.c
+++ b/drivers/oprofile/oprofile_files.c
@@ -175,7 +175,7 @@ static const struct file_operations dump_fops = {
        .llseek         = noop_llseek,
 };
 
-void oprofile_create_files(struct super_block *sb, struct dentry *root)
+void oprofile_create_files(struct dentry *root)
 {
        /* reinitialize default values */
        oprofile_buffer_size =          BUFFER_SIZE_DEFAULT;
@@ -183,19 +183,19 @@ void oprofile_create_files(struct super_block *sb, struct dentry *root)
        oprofile_buffer_watershed =     BUFFER_WATERSHED_DEFAULT;
        oprofile_time_slice =           msecs_to_jiffies(TIME_SLICE_DEFAULT);
 
-       oprofilefs_create_file(sb, root, "enable", &enable_fops);
-       oprofilefs_create_file_perm(sb, root, "dump", &dump_fops, 0666);
-       oprofilefs_create_file(sb, root, "buffer", &event_buffer_fops);
-       oprofilefs_create_ulong(sb, root, "buffer_size", &oprofile_buffer_size);
-       oprofilefs_create_ulong(sb, root, "buffer_watershed", &oprofile_buffer_watershed);
-       oprofilefs_create_ulong(sb, root, "cpu_buffer_size", &oprofile_cpu_buffer_size);
-       oprofilefs_create_file(sb, root, "cpu_type", &cpu_type_fops);
-       oprofilefs_create_file(sb, root, "backtrace_depth", &depth_fops);
-       oprofilefs_create_file(sb, root, "pointer_size", &pointer_size_fops);
+       oprofilefs_create_file(root->d_sb, root, "enable", &enable_fops);
+       oprofilefs_create_file_perm(root->d_sb, root, "dump", &dump_fops, 0666);
+       oprofilefs_create_file(root->d_sb, root, "buffer", &event_buffer_fops);
+       oprofilefs_create_ulong(root->d_sb, root, "buffer_size", &oprofile_buffer_size);
+       oprofilefs_create_ulong(root->d_sb, root, "buffer_watershed", &oprofile_buffer_watershed);
+       oprofilefs_create_ulong(root->d_sb, root, "cpu_buffer_size", &oprofile_cpu_buffer_size);
+       oprofilefs_create_file(root->d_sb, root, "cpu_type", &cpu_type_fops);
+       oprofilefs_create_file(root->d_sb, root, "backtrace_depth", &depth_fops);
+       oprofilefs_create_file(root->d_sb, root, "pointer_size", &pointer_size_fops);
 #ifdef CONFIG_OPROFILE_EVENT_MULTIPLEX
-       oprofilefs_create_file(sb, root, "time_slice", &timeout_fops);
+       oprofilefs_create_file(root->d_sb, root, "time_slice", &timeout_fops);
 #endif
-       oprofile_create_stats_files(sb, root);
+       oprofile_create_stats_files(root->d_sb, root);
        if (oprofile_ops.create_files)
-               oprofile_ops.create_files(sb, root);
+               oprofile_ops.create_files(root->d_sb, root);
 }

diff --git a/drivers/oprofile/oprofilefs.c b/drivers/oprofile/oprofilefs.c
index 7c12d9c2b23010a54c2752a0abac70b1bcf17735..2e2dd5ca72115a7e95eb2c92455c6f825d882bfe 100644 (file)
--- a/drivers/oprofile/oprofilefs.c
+++ b/drivers/oprofile/oprofilefs.c
@@ -256,7 +256,7 @@ static int oprofilefs_fill_super(struct super_block *sb, void *data, int silent)
        if (!sb->s_root)
                return -ENOMEM;
 
-       oprofile_create_files(sb, sb->s_root);
+       oprofile_create_files(sb->s_root);
 
        // FIXME: verify kill_litter_super removes our dentries
        return 0;