Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 28444a2b authored by Al Viro's avatar Al Viro
Browse files

configfs_add_file: fold into its sole caller 



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

fs/configfs/configfs_internal.h

+0 −1
Original line number Diff line number Diff line
@@ -76,7 +76,6 @@ extern int configfs_make_dirent(struct configfs_dirent *, 
				struct dentry *, void *, umode_t, int);

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 const unsigned char * configfs_get_name(struct configfs_dirent *sd);

fs/configfs/file.c

+10 −18
Original line number Diff line number Diff line
@@ -313,21 +313,6 @@ const struct file_operations configfs_file_operations = { 
	.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.

 *	@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)

{

	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);

	error = configfs_make_dirent(parent_sd, NULL, (void *) attr, mode,

				     CONFIGFS_ITEM_ATTR);

	mutex_unlock(&dir->d_inode->i_mutex);



	return error;

}