Commit 40437c71 authored by Al Viro's avatar Al Viro
Browse files

don't bother with passing superblock to oprofile_create_stats_files() 



Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent ef7bca14

drivers/oprofile/oprofile_files.c

+1 −1
Original line number Diff line number Diff line
@@ -195,7 +195,7 @@ void oprofile_create_files(struct dentry *root) 
#ifdef CONFIG_OPROFILE_EVENT_MULTIPLEX

	oprofilefs_create_file(root->d_sb, root, "time_slice", &timeout_fops);

#endif

	oprofile_create_stats_files(root->d_sb, root);

	oprofile_create_stats_files(root);

	if (oprofile_ops.create_files)

		oprofile_ops.create_files(root);

}

drivers/oprofile/oprofile_stats.c

+12 −12
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ void oprofile_reset_stats(void) 
}





void oprofile_create_stats_files(struct super_block *sb, struct dentry *root)

void oprofile_create_stats_files(struct dentry *root)

{

	struct oprofile_cpu_buffer *cpu_buf;

	struct dentry *cpudir;
@@ -46,39 +46,39 @@ void oprofile_create_stats_files(struct super_block *sb, struct dentry *root) 
	char buf[10];

	int i;



	dir = oprofilefs_mkdir(sb, root, "stats");

	dir = oprofilefs_mkdir(root->d_sb, root, "stats");

	if (!dir)

		return;



	for_each_possible_cpu(i) {

		cpu_buf = &per_cpu(op_cpu_buffer, i);

		snprintf(buf, 10, "cpu%d", i);

		cpudir = oprofilefs_mkdir(sb, dir, buf);

		cpudir = oprofilefs_mkdir(root->d_sb, dir, buf);



		/* Strictly speaking access to these ulongs is racy,

		 * but we can't simply lock them, and they are

		 * informational only.

		 */

		oprofilefs_create_ro_ulong(sb, cpudir, "sample_received",

		oprofilefs_create_ro_ulong(root->d_sb, cpudir, "sample_received",

			&cpu_buf->sample_received);

		oprofilefs_create_ro_ulong(sb, cpudir, "sample_lost_overflow",

		oprofilefs_create_ro_ulong(root->d_sb, cpudir, "sample_lost_overflow",

			&cpu_buf->sample_lost_overflow);

		oprofilefs_create_ro_ulong(sb, cpudir, "backtrace_aborted",

		oprofilefs_create_ro_ulong(root->d_sb, cpudir, "backtrace_aborted",

			&cpu_buf->backtrace_aborted);

		oprofilefs_create_ro_ulong(sb, cpudir, "sample_invalid_eip",

		oprofilefs_create_ro_ulong(root->d_sb, cpudir, "sample_invalid_eip",

			&cpu_buf->sample_invalid_eip);

	}



	oprofilefs_create_ro_atomic(sb, dir, "sample_lost_no_mm",

	oprofilefs_create_ro_atomic(root->d_sb, dir, "sample_lost_no_mm",

		&oprofile_stats.sample_lost_no_mm);

	oprofilefs_create_ro_atomic(sb, dir, "sample_lost_no_mapping",

	oprofilefs_create_ro_atomic(root->d_sb, dir, "sample_lost_no_mapping",

		&oprofile_stats.sample_lost_no_mapping);

	oprofilefs_create_ro_atomic(sb, dir, "event_lost_overflow",

	oprofilefs_create_ro_atomic(root->d_sb, dir, "event_lost_overflow",

		&oprofile_stats.event_lost_overflow);

	oprofilefs_create_ro_atomic(sb, dir, "bt_lost_no_mapping",

	oprofilefs_create_ro_atomic(root->d_sb, dir, "bt_lost_no_mapping",

		&oprofile_stats.bt_lost_no_mapping);

#ifdef CONFIG_OPROFILE_EVENT_MULTIPLEX

	oprofilefs_create_ro_atomic(sb, dir, "multiplex_counter",

	oprofilefs_create_ro_atomic(root->d_sb, dir, "multiplex_counter",

		&oprofile_stats.multiplex_counter);

#endif

}

drivers/oprofile/oprofile_stats.h

+1 −1
Original line number Diff line number Diff line
@@ -29,6 +29,6 @@ struct super_block; 
struct dentry;



/* create the stats/ dir */

void oprofile_create_stats_files(struct super_block *sb, struct dentry *root);

void oprofile_create_stats_files(struct dentry *root);



#endif /* OPROFILE_STATS_H */