redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

oprofilefs_mkdir() doesn't need superblock argument 

it's always equal to ->d_sb of the second argument (parent dentry),
due to either being literally that, or ->d_sb of parent's parent.

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
hifive-unleashed-5.1
Al Viro 2013-07-19 15:58:27 +04:00
parent 40437c718a
commit ecde28237e
11 changed files with 21 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/alpha/oprofile/common.c
View File

@ -115,7 +115,7 @@ op_axp_create_files(struct dentry *root)
char buf[4];
snprintf(buf, sizeof buf, "%d", i);
dir = oprofilefs_mkdir(root->d_sb, root, buf);
dir = oprofilefs_mkdir(root, buf);
oprofilefs_create_ulong(root->d_sb, dir, "enabled", &ctr[i].enabled);
oprofilefs_create_ulong(root->d_sb, dir, "event", &ctr[i].event);

2
arch/avr32/oprofile/op_model_avr32.c
View File

@ -105,7 +105,7 @@ static int avr32_perf_counter_create_files(struct dentry *root)
for (i = 0; i < NR_counter; i++) {
snprintf(filename, sizeof(filename), "%u", i);
dir = oprofilefs_mkdir(root->d_sb, root, filename);
dir = oprofilefs_mkdir(root, filename);
oprofilefs_create_ulong(root->d_sb, dir, "enabled",
&counter[i].enabled);

2
arch/mips/oprofile/common.c
View File

@ -42,7 +42,7 @@ static int op_mips_create_files(struct dentry *root)
char buf[4];
snprintf(buf, sizeof buf, "%d", i);
dir = oprofilefs_mkdir(root->d_sb, root, buf);
dir = oprofilefs_mkdir(root, buf);
oprofilefs_create_ulong(root->d_sb, dir, "enabled", &ctr[i].enabled);
oprofilefs_create_ulong(root->d_sb, dir, "event", &ctr[i].event);

2
arch/powerpc/oprofile/common.c
View File

@ -160,7 +160,7 @@ static int op_powerpc_create_files(struct dentry *root)
char buf[4];
snprintf(buf, sizeof buf, "%d", i);
dir = oprofilefs_mkdir(root->d_sb, root, buf);
dir = oprofilefs_mkdir(root, buf);
oprofilefs_create_ulong(root->d_sb, dir, "enabled", &ctr[i].enabled);
oprofilefs_create_ulong(root->d_sb, dir, "event", &ctr[i].event);

6
arch/s390/oprofile/init.c
View File

@ -350,7 +350,7 @@ static int oprofile_create_hwsampling_files(struct dentry *root)
{
struct dentry *dir;
dir = oprofilefs_mkdir(root->d_sb, root, "timer");
dir = oprofilefs_mkdir(root, "timer");
if (!dir)
return -EINVAL;
@ -375,7 +375,7 @@ static int oprofile_create_hwsampling_files(struct dentry *root)
* and can only be set to 0.
*/
dir = oprofilefs_mkdir(root->d_sb, root, "0");
dir = oprofilefs_mkdir(root, "0");
if (!dir)
return -EINVAL;
@ -395,7 +395,7 @@ static int oprofile_create_hwsampling_files(struct dentry *root)
* space tools. The /dev/oprofile/hwsampling fs is
* provided in that case.
*/
dir = oprofilefs_mkdir(root->d_sb, root, "hwsampling");
dir = oprofilefs_mkdir(root, "hwsampling");
if (!dir)
return -EINVAL;

2
arch/x86/oprofile/nmi_int.c
View File

@ -420,7 +420,7 @@ static int nmi_create_files(struct dentry *root)
continue;
snprintf(buf, sizeof(buf), "%d", i);
dir = oprofilefs_mkdir(root->d_sb, root, buf);
dir = oprofilefs_mkdir(root, buf);
oprofilefs_create_ulong(root->d_sb, dir, "enabled", &counter_config[i].enabled);
oprofilefs_create_ulong(root->d_sb, dir, "event", &counter_config[i].event);
oprofilefs_create_ulong(root->d_sb, dir, "count", &counter_config[i].count);

4
arch/x86/oprofile/op_model_amd.c
View File

@ -479,7 +479,7 @@ static int setup_ibs_files(struct dentry *root)
ibs_config.max_cnt_op = 250000;
if (ibs_caps & IBS_CAPS_FETCHSAM) {
dir = oprofilefs_mkdir(root->d_sb, root, "ibs_fetch");
dir = oprofilefs_mkdir(root, "ibs_fetch");
oprofilefs_create_ulong(root->d_sb, dir, "enable",
&ibs_config.fetch_enabled);
oprofilefs_create_ulong(root->d_sb, dir, "max_count",
@ -489,7 +489,7 @@ static int setup_ibs_files(struct dentry *root)
}
if (ibs_caps & IBS_CAPS_OPSAM) {
dir = oprofilefs_mkdir(root->d_sb, root, "ibs_op");
dir = oprofilefs_mkdir(root, "ibs_op");
oprofilefs_create_ulong(root->d_sb, dir, "enable",
&ibs_config.op_enabled);
oprofilefs_create_ulong(root->d_sb, dir, "max_count",

2
drivers/oprofile/oprofile_perf.c
View File

@ -147,7 +147,7 @@ static int oprofile_perf_create_files(struct dentry *root)
char buf[4];
snprintf(buf, sizeof buf, "%d", i);
dir = oprofilefs_mkdir(root->d_sb, root, buf);
dir = oprofilefs_mkdir(root, buf);
oprofilefs_create_ulong(root->d_sb, dir, "enabled", &counter_config[i].enabled);
oprofilefs_create_ulong(root->d_sb, dir, "event", &counter_config[i].event);
oprofilefs_create_ulong(root->d_sb, dir, "count", &counter_config[i].count);

4
drivers/oprofile/oprofile_stats.c
View File

@ -46,14 +46,14 @@ void oprofile_create_stats_files(struct dentry *root)
char buf[10];
int i;
dir = oprofilefs_mkdir(root->d_sb, root, "stats");
dir = oprofilefs_mkdir(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(root->d_sb, dir, buf);
cpudir = oprofilefs_mkdir(dir, buf);
/* Strictly speaking access to these ulongs is racy,
* but we can't simply lock them, and they are

15
drivers/oprofile/oprofilefs.c
View File

@ -211,28 +211,27 @@ int oprofilefs_create_file_perm(struct super_block *sb, struct dentry *root,
}
struct dentry *oprofilefs_mkdir(struct super_block *sb,
struct dentry *root, char const *name)
struct dentry *oprofilefs_mkdir(struct dentry *parent, char const *name)
{
struct dentry *dentry;
struct inode *inode;
mutex_lock(&root->d_inode->i_mutex);
dentry = d_alloc_name(root, name);
mutex_lock(&parent->d_inode->i_mutex);
dentry = d_alloc_name(parent, name);
if (!dentry) {
mutex_unlock(&root->d_inode->i_mutex);
mutex_unlock(&parent->d_inode->i_mutex);
return NULL;
}
inode = oprofilefs_get_inode(sb, S_IFDIR | 0755);
inode = oprofilefs_get_inode(parent->d_sb, S_IFDIR | 0755);
if (!inode) {
dput(dentry);
mutex_unlock(&root->d_inode->i_mutex);
mutex_unlock(&parent->d_inode->i_mutex);
return NULL;
}
inode->i_op = &simple_dir_inode_operations;
inode->i_fop = &simple_dir_operations;
d_add(dentry, inode);
mutex_unlock(&root->d_inode->i_mutex);
mutex_unlock(&parent->d_inode->i_mutex);
return dentry;
}

3
include/linux/oprofile.h
View File

@ -144,8 +144,7 @@ int oprofilefs_create_ro_atomic(struct super_block * sb, struct dentry * root,
char const * name, atomic_t * val);
/** create a directory */
struct dentry * oprofilefs_mkdir(struct super_block * sb, struct dentry * root,
char const * name);
struct dentry *oprofilefs_mkdir(struct dentry *parent, char const *name);
/**
* Write the given asciz string to the given user buffer @buf, updating *offset