4 files changed, 46 insertions, 69 deletions

diff --git a/fs/configfs/configfs_internal.h b/fs/configfs/configfs_internal.h
index a315677e44d3..b65d1ef532d5 100644
--- a/fs/configfs/configfs_internal.h
+++ b/fs/configfs/configfs_internal.h
@@ -69,14 +69,13 @@ extern struct kmem_cache *configfs_dir_cachep;
 extern int configfs_is_root(struct config_item *item);
 
 extern struct inode * configfs_new_inode(umode_t mode, struct configfs_dirent *, struct super_block *);
-extern int configfs_create(struct dentry *, umode_t mode, int (*init)(struct inode *));
+extern int configfs_create(struct dentry *, umode_t mode, void (*init)(struct inode *));
 
 extern int configfs_create_file(struct config_item *, const struct configfs_attribute *);
 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);
diff --git a/fs/configfs/dir.c b/fs/configfs/dir.c
index c9c298bd3058..cf0db005d2f5 100644
--- a/fs/configfs/dir.c
+++ b/fs/configfs/dir.c
@@ -240,60 +240,26 @@ int configfs_make_dirent(struct configfs_dirent * parent_sd,
         return 0;
 }
 
-static int init_dir(struct inode * inode)
+static void init_dir(struct inode * inode)
 {
         inode->i_op = &configfs_dir_inode_operations;
         inode->i_fop = &configfs_dir_operations;
 
         /* directory inodes start off with i_nlink == 2 (for "." entry) */
         inc_nlink(inode);
-        return 0;
 }
 
-static int configfs_init_file(struct inode * inode)
+static void configfs_init_file(struct inode * inode)
 {
         inode->i_size = PAGE_SIZE;
         inode->i_fop = &configfs_file_operations;
-        return 0;
 }
 
-static int init_symlink(struct inode * inode)
+static void init_symlink(struct inode * inode)
 {
         inode->i_op = &configfs_symlink_inode_operations;
-        return 0;
-}
-
-static int create_dir(struct config_item *k, struct dentry *d)
-{
-        int error;
-        umode_t mode = S_IFDIR| S_IRWXU | S_IRUGO | S_IXUGO;
-        struct dentry *p = d->d_parent;
-
-        BUG_ON(!k);
-
-        error = configfs_dirent_exists(p->d_fsdata, d->d_name.name);
-        if (!error)
-                error = configfs_make_dirent(p->d_fsdata, d, k, mode,
-                                             CONFIGFS_DIR | CONFIGFS_USET_CREATING);
-        if (!error) {
-                configfs_set_dir_dirent_depth(p->d_fsdata, d->d_fsdata);
-                error = configfs_create(d, mode, init_dir);
-                if (!error) {
-                        inc_nlink(p->d_inode);
-                } else {
-                        struct configfs_dirent *sd = d->d_fsdata;
-                        if (sd) {
-                                spin_lock(&configfs_dirent_lock);
-                                list_del_init(&sd->s_sibling);
-                                spin_unlock(&configfs_dirent_lock);
-                                configfs_put(sd);
-                        }
-                }
-        }
-        return error;
 }
 
-
 /**
  *      configfs_create_dir - create a directory for an config_item.
  *      @item:          config_itemwe're creating directory for.
@@ -303,11 +269,37 @@ static int create_dir(struct config_item *k, struct dentry *d)
  *      until it is validated by configfs_dir_set_ready()
  */
 
-static int configfs_create_dir(struct config_item * item, struct dentry *dentry)
+static int configfs_create_dir(struct config_item *item, struct dentry *dentry)
 {
-        int error = create_dir(item, dentry);
-        if (!error)
+        int error;
+        umode_t mode = S_IFDIR| S_IRWXU | S_IRUGO | S_IXUGO;
+        struct dentry *p = dentry->d_parent;
+
+        BUG_ON(!item);
+
+        error = configfs_dirent_exists(p->d_fsdata, dentry->d_name.name);
+        if (unlikely(error))
+                return error;
+
+        error = configfs_make_dirent(p->d_fsdata, dentry, item, mode,
+                                     CONFIGFS_DIR | CONFIGFS_USET_CREATING);
+        if (unlikely(error))
+                return error;
+
+        configfs_set_dir_dirent_depth(p->d_fsdata, dentry->d_fsdata);
+        error = configfs_create(dentry, mode, init_dir);
+        if (!error) {
+                inc_nlink(p->d_inode);
                 item->ci_dentry = dentry;
+        } else {
+                struct configfs_dirent *sd = dentry->d_fsdata;
+                if (sd) {
+                        spin_lock(&configfs_dirent_lock);
+                        list_del_init(&sd->s_sibling);
+                        spin_unlock(&configfs_dirent_lock);
+                        configfs_put(sd);
+                }
+        }
         return error;
 }
 
diff --git a/fs/configfs/file.c b/fs/configfs/file.c
index 1d1c41f1014d..56d2cdc9ae0a 100644
--- 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;
 }
 
diff --git a/fs/configfs/inode.c b/fs/configfs/inode.c
index 65af86147154..5423a6a6ecc8 100644
--- a/fs/configfs/inode.c
+++ b/fs/configfs/inode.c
@@ -176,7 +176,7 @@ static void configfs_set_inode_lock_class(struct configfs_dirent *sd,
 
 #endif /* CONFIG_LOCKDEP */
 
-int configfs_create(struct dentry * dentry, umode_t mode, int (*init)(struct inode *))
+int configfs_create(struct dentry * dentry, umode_t mode, void (*init)(struct inode *))
 {
         int error = 0;
         struct inode *inode = NULL;
@@ -198,13 +198,7 @@ int configfs_create(struct dentry * dentry, umode_t mode, int (*init)(struct ino
         p_inode->i_mtime = p_inode->i_ctime = CURRENT_TIME;
         configfs_set_inode_lock_class(sd, inode);
 
-        if (init) {
-                error = init(inode);
-                if (error) {
-                        iput(inode);
-                        return error;
-                }
-        }
+        init(inode);
         d_instantiate(dentry, inode);
         if (S_ISDIR(mode) || S_ISLNK(mode))
                 dget(dentry);  /* pin link and directory dentries in core */
@@ -242,7 +236,7 @@ void configfs_drop_dentry(struct configfs_dirent * sd, struct dentry * parent)
 
         if (dentry) {
                 spin_lock(&dentry->d_lock);
-                if (!(d_unhashed(dentry) && dentry->d_inode)) {
+                if (!d_unhashed(dentry) && dentry->d_inode) {
                         dget_dlock(dentry);
                         __d_drop(dentry);
                         spin_unlock(&dentry->d_lock);