diff options
Diffstat (limited to 'drivers/oprofile')
-rw-r--r-- | drivers/oprofile/oprof.h | 2 | ||||
-rw-r--r-- | drivers/oprofile/oprofile_files.c | 26 | ||||
-rw-r--r-- | drivers/oprofile/oprofilefs.c | 2 |
3 files changed, 15 insertions, 15 deletions
diff --git a/drivers/oprofile/oprof.h b/drivers/oprofile/oprof.h index d32ef816337c..8c43f20ab5fa 100644 --- a/drivers/oprofile/oprof.h +++ b/drivers/oprofile/oprof.h | |||
@@ -33,7 +33,7 @@ extern unsigned long oprofile_backtrace_depth; | |||
33 | struct super_block; | 33 | struct super_block; |
34 | struct dentry; | 34 | struct dentry; |
35 | 35 | ||
36 | void oprofile_create_files(struct super_block *sb, struct dentry *root); | 36 | void oprofile_create_files(struct dentry *root); |
37 | int oprofile_timer_init(struct oprofile_operations *ops); | 37 | int oprofile_timer_init(struct oprofile_operations *ops); |
38 | #ifdef CONFIG_OPROFILE_NMI_TIMER | 38 | #ifdef CONFIG_OPROFILE_NMI_TIMER |
39 | int op_nmi_timer_init(struct oprofile_operations *ops); | 39 | int op_nmi_timer_init(struct oprofile_operations *ops); |
diff --git a/drivers/oprofile/oprofile_files.c b/drivers/oprofile/oprofile_files.c index 84a208dbed93..97c345ff62c4 100644 --- a/drivers/oprofile/oprofile_files.c +++ b/drivers/oprofile/oprofile_files.c | |||
@@ -175,7 +175,7 @@ static const struct file_operations dump_fops = { | |||
175 | .llseek = noop_llseek, | 175 | .llseek = noop_llseek, |
176 | }; | 176 | }; |
177 | 177 | ||
178 | void oprofile_create_files(struct super_block *sb, struct dentry *root) | 178 | void oprofile_create_files(struct dentry *root) |
179 | { | 179 | { |
180 | /* reinitialize default values */ | 180 | /* reinitialize default values */ |
181 | oprofile_buffer_size = BUFFER_SIZE_DEFAULT; | 181 | oprofile_buffer_size = BUFFER_SIZE_DEFAULT; |
@@ -183,19 +183,19 @@ void oprofile_create_files(struct super_block *sb, struct dentry *root) | |||
183 | oprofile_buffer_watershed = BUFFER_WATERSHED_DEFAULT; | 183 | oprofile_buffer_watershed = BUFFER_WATERSHED_DEFAULT; |
184 | oprofile_time_slice = msecs_to_jiffies(TIME_SLICE_DEFAULT); | 184 | oprofile_time_slice = msecs_to_jiffies(TIME_SLICE_DEFAULT); |
185 | 185 | ||
186 | oprofilefs_create_file(sb, root, "enable", &enable_fops); | 186 | oprofilefs_create_file(root->d_sb, root, "enable", &enable_fops); |
187 | oprofilefs_create_file_perm(sb, root, "dump", &dump_fops, 0666); | 187 | oprofilefs_create_file_perm(root->d_sb, root, "dump", &dump_fops, 0666); |
188 | oprofilefs_create_file(sb, root, "buffer", &event_buffer_fops); | 188 | oprofilefs_create_file(root->d_sb, root, "buffer", &event_buffer_fops); |
189 | oprofilefs_create_ulong(sb, root, "buffer_size", &oprofile_buffer_size); | 189 | oprofilefs_create_ulong(root->d_sb, root, "buffer_size", &oprofile_buffer_size); |
190 | oprofilefs_create_ulong(sb, root, "buffer_watershed", &oprofile_buffer_watershed); | 190 | oprofilefs_create_ulong(root->d_sb, root, "buffer_watershed", &oprofile_buffer_watershed); |
191 | oprofilefs_create_ulong(sb, root, "cpu_buffer_size", &oprofile_cpu_buffer_size); | 191 | oprofilefs_create_ulong(root->d_sb, root, "cpu_buffer_size", &oprofile_cpu_buffer_size); |
192 | oprofilefs_create_file(sb, root, "cpu_type", &cpu_type_fops); | 192 | oprofilefs_create_file(root->d_sb, root, "cpu_type", &cpu_type_fops); |
193 | oprofilefs_create_file(sb, root, "backtrace_depth", &depth_fops); | 193 | oprofilefs_create_file(root->d_sb, root, "backtrace_depth", &depth_fops); |
194 | oprofilefs_create_file(sb, root, "pointer_size", &pointer_size_fops); | 194 | oprofilefs_create_file(root->d_sb, root, "pointer_size", &pointer_size_fops); |
195 | #ifdef CONFIG_OPROFILE_EVENT_MULTIPLEX | 195 | #ifdef CONFIG_OPROFILE_EVENT_MULTIPLEX |
196 | oprofilefs_create_file(sb, root, "time_slice", &timeout_fops); | 196 | oprofilefs_create_file(root->d_sb, root, "time_slice", &timeout_fops); |
197 | #endif | 197 | #endif |
198 | oprofile_create_stats_files(sb, root); | 198 | oprofile_create_stats_files(root->d_sb, root); |
199 | if (oprofile_ops.create_files) | 199 | if (oprofile_ops.create_files) |
200 | oprofile_ops.create_files(sb, root); | 200 | oprofile_ops.create_files(root->d_sb, root); |
201 | } | 201 | } |
diff --git a/drivers/oprofile/oprofilefs.c b/drivers/oprofile/oprofilefs.c index 7c12d9c2b230..2e2dd5ca7211 100644 --- 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) | |||
256 | if (!sb->s_root) | 256 | if (!sb->s_root) |
257 | return -ENOMEM; | 257 | return -ENOMEM; |
258 | 258 | ||
259 | oprofile_create_files(sb, sb->s_root); | 259 | oprofile_create_files(sb->s_root); |
260 | 260 | ||
261 | // FIXME: verify kill_litter_super removes our dentries | 261 | // FIXME: verify kill_litter_super removes our dentries |
262 | return 0; | 262 | return 0; |