Commit 40437c718a69562bafaf9e5c9d17b6628e2576b1
1 parent
ef7bca1456
Exists in
smarc-imx_3.14.28_1.0.0_ga
and in
1 other branch
don't bother with passing superblock to oprofile_create_stats_files()
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Showing 3 changed files with 14 additions and 14 deletions Side-by-side Diff
drivers/oprofile/oprofile_files.c
| ... | ... | @@ -195,7 +195,7 @@ |
| 195 | 195 | #ifdef CONFIG_OPROFILE_EVENT_MULTIPLEX |
| 196 | 196 | oprofilefs_create_file(root->d_sb, root, "time_slice", &timeout_fops); |
| 197 | 197 | #endif |
| 198 | - oprofile_create_stats_files(root->d_sb, root); | |
| 198 | + oprofile_create_stats_files(root); | |
| 199 | 199 | if (oprofile_ops.create_files) |
| 200 | 200 | oprofile_ops.create_files(root); |
| 201 | 201 | } |
drivers/oprofile/oprofile_stats.c
| ... | ... | @@ -38,7 +38,7 @@ |
| 38 | 38 | } |
| 39 | 39 | |
| 40 | 40 | |
| 41 | -void oprofile_create_stats_files(struct super_block *sb, struct dentry *root) | |
| 41 | +void oprofile_create_stats_files(struct dentry *root) | |
| 42 | 42 | { |
| 43 | 43 | struct oprofile_cpu_buffer *cpu_buf; |
| 44 | 44 | struct dentry *cpudir; |
| 45 | 45 | |
| 46 | 46 | |
| 47 | 47 | |
| 48 | 48 | |
| 49 | 49 | |
| 50 | 50 | |
| 51 | 51 | |
| 52 | 52 | |
| 53 | 53 | |
| 54 | 54 | |
| ... | ... | @@ -46,39 +46,39 @@ |
| 46 | 46 | char buf[10]; |
| 47 | 47 | int i; |
| 48 | 48 | |
| 49 | - dir = oprofilefs_mkdir(sb, root, "stats"); | |
| 49 | + dir = oprofilefs_mkdir(root->d_sb, root, "stats"); | |
| 50 | 50 | if (!dir) |
| 51 | 51 | return; |
| 52 | 52 | |
| 53 | 53 | for_each_possible_cpu(i) { |
| 54 | 54 | cpu_buf = &per_cpu(op_cpu_buffer, i); |
| 55 | 55 | snprintf(buf, 10, "cpu%d", i); |
| 56 | - cpudir = oprofilefs_mkdir(sb, dir, buf); | |
| 56 | + cpudir = oprofilefs_mkdir(root->d_sb, dir, buf); | |
| 57 | 57 | |
| 58 | 58 | /* Strictly speaking access to these ulongs is racy, |
| 59 | 59 | * but we can't simply lock them, and they are |
| 60 | 60 | * informational only. |
| 61 | 61 | */ |
| 62 | - oprofilefs_create_ro_ulong(sb, cpudir, "sample_received", | |
| 62 | + oprofilefs_create_ro_ulong(root->d_sb, cpudir, "sample_received", | |
| 63 | 63 | &cpu_buf->sample_received); |
| 64 | - oprofilefs_create_ro_ulong(sb, cpudir, "sample_lost_overflow", | |
| 64 | + oprofilefs_create_ro_ulong(root->d_sb, cpudir, "sample_lost_overflow", | |
| 65 | 65 | &cpu_buf->sample_lost_overflow); |
| 66 | - oprofilefs_create_ro_ulong(sb, cpudir, "backtrace_aborted", | |
| 66 | + oprofilefs_create_ro_ulong(root->d_sb, cpudir, "backtrace_aborted", | |
| 67 | 67 | &cpu_buf->backtrace_aborted); |
| 68 | - oprofilefs_create_ro_ulong(sb, cpudir, "sample_invalid_eip", | |
| 68 | + oprofilefs_create_ro_ulong(root->d_sb, cpudir, "sample_invalid_eip", | |
| 69 | 69 | &cpu_buf->sample_invalid_eip); |
| 70 | 70 | } |
| 71 | 71 | |
| 72 | - oprofilefs_create_ro_atomic(sb, dir, "sample_lost_no_mm", | |
| 72 | + oprofilefs_create_ro_atomic(root->d_sb, dir, "sample_lost_no_mm", | |
| 73 | 73 | &oprofile_stats.sample_lost_no_mm); |
| 74 | - oprofilefs_create_ro_atomic(sb, dir, "sample_lost_no_mapping", | |
| 74 | + oprofilefs_create_ro_atomic(root->d_sb, dir, "sample_lost_no_mapping", | |
| 75 | 75 | &oprofile_stats.sample_lost_no_mapping); |
| 76 | - oprofilefs_create_ro_atomic(sb, dir, "event_lost_overflow", | |
| 76 | + oprofilefs_create_ro_atomic(root->d_sb, dir, "event_lost_overflow", | |
| 77 | 77 | &oprofile_stats.event_lost_overflow); |
| 78 | - oprofilefs_create_ro_atomic(sb, dir, "bt_lost_no_mapping", | |
| 78 | + oprofilefs_create_ro_atomic(root->d_sb, dir, "bt_lost_no_mapping", | |
| 79 | 79 | &oprofile_stats.bt_lost_no_mapping); |
| 80 | 80 | #ifdef CONFIG_OPROFILE_EVENT_MULTIPLEX |
| 81 | - oprofilefs_create_ro_atomic(sb, dir, "multiplex_counter", | |
| 81 | + oprofilefs_create_ro_atomic(root->d_sb, dir, "multiplex_counter", | |
| 82 | 82 | &oprofile_stats.multiplex_counter); |
| 83 | 83 | #endif |
| 84 | 84 | } |
drivers/oprofile/oprofile_stats.h