Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-11 22:51:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

debugfs: kill __create_file()

Browse Source 
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Al Viro 2015-01-25 14:02:31 -05:00
parent 190afd81e4
commit ad5abd5ba8
1 changed files with 33 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
fs/debugfs/inode.c
View File

@ -348,30 +348,6 @@ static struct dentry *end_creating(struct dentry *dentry, int error)
return dentry; 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) {
case S_IFDIR:
error = debugfs_mkdir(dentry, mode);
break;
case S_IFLNK:
error = debugfs_link(dentry, mode, data);
break;
default:
error = debugfs_create(dentry, mode, data, fops);
break;
}
return end_creating(dentry, error);
}
/** /**
* debugfs_create_file - create a file in the debugfs filesystem * debugfs_create_file - create a file in the debugfs filesystem
* @name: a pointer to a string containing the name of the file to create. * @name: a pointer to a string containing the name of the file to create.
@ -402,15 +378,19 @@ struct dentry *debugfs_create_file(const char *name, umode_t mode,
struct dentry *parent, void *data, struct dentry *parent, void *data,
const struct file_operations *fops) const struct file_operations *fops)
{ {
switch (mode & S_IFMT) { struct dentry *dentry;
case S_IFREG: int error;
case 0:
break;
default:
BUG();
}
return __create_file(name, mode, parent, data, fops); if (!(mode & S_IFMT))
mode |= S_IFREG;
BUG_ON(!S_ISREG(mode));
dentry = start_creating(name, parent);
if (IS_ERR(dentry))
return NULL;
error = debugfs_create(dentry, mode, data, fops);
return end_creating(dentry, error);
} }
EXPORT_SYMBOL_GPL(debugfs_create_file); EXPORT_SYMBOL_GPL(debugfs_create_file);
@ -434,8 +414,14 @@ EXPORT_SYMBOL_GPL(debugfs_create_file);
*/ */
struct dentry *debugfs_create_dir(const char *name, struct dentry *parent) struct dentry *debugfs_create_dir(const char *name, struct dentry *parent)
{ {
return __create_file(name, S_IFDIR | S_IRWXU | S_IRUGO | S_IXUGO, struct dentry *dentry = start_creating(name, parent);
parent, NULL, NULL); int error;
if (IS_ERR(dentry))
return NULL;
error = debugfs_mkdir(dentry, S_IFDIR | S_IRWXU | S_IRUGO | S_IXUGO);
return end_creating(dentry, error);
} }
EXPORT_SYMBOL_GPL(debugfs_create_dir); EXPORT_SYMBOL_GPL(debugfs_create_dir);
@ -465,17 +451,26 @@ EXPORT_SYMBOL_GPL(debugfs_create_dir);
struct dentry *debugfs_create_symlink(const char *name, struct dentry *parent, struct dentry *debugfs_create_symlink(const char *name, struct dentry *parent,
const char *target) const char *target)
{ {
struct dentry *result; struct dentry *dentry;
char *link; char *link;
int error;
link = kstrdup(target, GFP_KERNEL); link = kstrdup(target, GFP_KERNEL);
if (!link) if (!link)
return NULL; return NULL;
result = __create_file(name, S_IFLNK | S_IRWXUGO, parent, link, NULL); dentry = start_creating(name, parent);
if (!result)
if (IS_ERR(dentry)) {
kfree(link); kfree(link);
return result; return NULL;
}
error = debugfs_link(dentry, S_IFLNK | S_IRWXUGO, link);
if (error)
kfree(link);
return end_creating(dentry, error);
} }
EXPORT_SYMBOL_GPL(debugfs_create_symlink); EXPORT_SYMBOL_GPL(debugfs_create_symlink);