AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

configfs_add_file: fold into its sole caller

Browse Source 
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Al Viro 2015-01-29 00:27:57 -05:00
parent 1cf97d0d3a
commit 28444a2bde
2 changed files with 10 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
fs/configfs/configfs_internal.h
View File

@ -76,7 +76,6 @@ extern int configfs_make_dirent(struct configfs_dirent *,
struct dentry *, void *, umode_t, int); struct dentry *, void *, umode_t, int);
extern int configfs_dirent_is_ready(struct configfs_dirent *); extern int configfs_dirent_is_ready(struct configfs_dirent *);
extern int configfs_add_file(struct dentry *, const struct configfs_attribute *, int);
extern void configfs_hash_and_remove(struct dentry * dir, const char * name); extern void configfs_hash_and_remove(struct dentry * dir, const char * name);
extern const unsigned char * configfs_get_name(struct configfs_dirent *sd); extern const unsigned char * configfs_get_name(struct configfs_dirent *sd);

28
fs/configfs/file.c
View File

@ -313,21 +313,6 @@ const struct file_operations configfs_file_operations = {
.release = configfs_release, .release = configfs_release,
}; };
int configfs_add_file(struct dentry * dir, const struct configfs_attribute * attr, int type)
{
struct configfs_dirent * parent_sd = dir->d_fsdata;
umode_t mode = (attr->ca_mode & S_IALLUGO) | S_IFREG;
int error = 0;
mutex_lock_nested(&dir->d_inode->i_mutex, I_MUTEX_NORMAL);
error = configfs_make_dirent(parent_sd, NULL, (void *) attr, mode, type);
mutex_unlock(&dir->d_inode->i_mutex);
return error;
}
/** /**
* configfs_create_file - create an attribute file for an item. * configfs_create_file - create an attribute file for an item.
* @item: item we're creating for. * @item: item we're creating for.
@ -336,9 +321,16 @@ int configfs_add_file(struct dentry * dir, const struct configfs_attribute * att
int configfs_create_file(struct config_item * item, const struct configfs_attribute * attr) int configfs_create_file(struct config_item * item, const struct configfs_attribute * attr)
{ {
BUG_ON(!item || !item->ci_dentry || !attr); struct dentry *dir = item->ci_dentry;
struct configfs_dirent *parent_sd = dir->d_fsdata;
umode_t mode = (attr->ca_mode & S_IALLUGO) | S_IFREG;
int error = 0;
return configfs_add_file(item->ci_dentry, attr, mutex_lock_nested(&dir->d_inode->i_mutex, I_MUTEX_NORMAL);
CONFIGFS_ITEM_ATTR); error = configfs_make_dirent(parent_sd, NULL, (void *) attr, mode,
CONFIGFS_ITEM_ATTR);
mutex_unlock(&dir->d_inode->i_mutex);
return error;
} }