Merge remote-tracking branches 'spi/fix/atmel', 'spi/fix/doc', 'spi/fix/dw', 'spi...

[cascardo/linux.git] / fs / configfs / file.c

diff --git a/fs/configfs/file.c b/fs/configfs/file.c
index 1d1c41f..56d2cdc 100644 (file)
--- a/fs/configfs/file.c
+++ b/fs/configfs/file.c
@@ -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,
-                                CONFIGFS_ITEM_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;
 }