leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

debugfs: split the beginning and the end of __create_file() off

Browse Source 
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Al Viro 2015-01-25 13:55:55 -05:00
parent e09ddf36dd
commit 190afd81e4
1 changed files with 39 additions and 22 deletions

53
fs/debugfs/inode.c
View File

@ -305,11 +305,9 @@ static struct file_system_type debug_fs_type = {
}; };
MODULE_ALIAS_FS("debugfs"); MODULE_ALIAS_FS("debugfs");
static struct dentry *__create_file(const char *name, umode_t mode, static struct dentry *start_creating(const char *name, struct dentry *parent)
struct dentry *parent, void *data,
const struct file_operations *fops)
{ {
struct dentry *dentry = NULL; struct dentry *dentry;
int error; int error;
pr_debug("debugfs: creating file '%s'\n",name); pr_debug("debugfs: creating file '%s'\n",name);
@ -317,7 +315,7 @@ static struct dentry *__create_file(const char *name, umode_t mode,
error = simple_pin_fs(&debug_fs_type, &debugfs_mount, error = simple_pin_fs(&debug_fs_type, &debugfs_mount,
&debugfs_mount_count); &debugfs_mount_count);
if (error) if (error)
goto exit; return ERR_PTR(error);
/* If the parent is not specified, we create it in the root. /* If the parent is not specified, we create it in the root.
* We need the root dentry to do this, which is in the super * We need the root dentry to do this, which is in the super
@ -329,11 +327,40 @@ static struct dentry *__create_file(const char *name, umode_t mode,
mutex_lock(&parent->d_inode->i_mutex); mutex_lock(&parent->d_inode->i_mutex);
dentry = lookup_one_len(name, parent, strlen(name)); dentry = lookup_one_len(name, parent, strlen(name));
if (!IS_ERR(dentry)) { if (!IS_ERR(dentry) && dentry->d_inode) {
dput(dentry);
dentry = ERR_PTR(-EEXIST);
}
if (IS_ERR(dentry))
mutex_unlock(&parent->d_inode->i_mutex);
return dentry;
}
static struct dentry *end_creating(struct dentry *dentry, int error)
{
mutex_unlock(&dentry->d_parent->d_inode->i_mutex);
dput(dentry);
if (error) {
dentry = NULL;
simple_release_fs(&debugfs_mount, &debugfs_mount_count);
}
return dentry;
}
static struct dentry *__create_file(const char *name, umode_t mode,
struct dentry *parent, void *data,
const struct file_operations *fops)
{
struct dentry *dentry = start_creating(name, parent);
int error;
if (IS_ERR(dentry))
return NULL;
switch (mode & S_IFMT) { switch (mode & S_IFMT) {
case S_IFDIR: case S_IFDIR:
error = debugfs_mkdir(dentry, mode); error = debugfs_mkdir(dentry, mode);
break; break;
case S_IFLNK: case S_IFLNK:
error = debugfs_link(dentry, mode, data); error = debugfs_link(dentry, mode, data);
@ -342,17 +369,7 @@ static struct dentry *__create_file(const char *name, umode_t mode,
error = debugfs_create(dentry, mode, data, fops); error = debugfs_create(dentry, mode, data, fops);
break; break;
} }
dput(dentry); return end_creating(dentry, error);
} else
error = PTR_ERR(dentry);
mutex_unlock(&parent->d_inode->i_mutex);
if (error) {
dentry = NULL;
simple_release_fs(&debugfs_mount, &debugfs_mount_count);
}
exit:
return dentry;
} }
/** /**