configfs: sanitize configfs_create()

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

1 files changed, 27 insertions, 28 deletions

diff --git a/fs/configfs/inode.c b/fs/configfs/inode.c
index 8cf21ef902fc..0074362d9f7f 100644
--- a/fs/configfs/inode.c
+++ b/fs/configfs/inode.c
@@ -187,36 +187,35 @@ static void configfs_set_inode_lock_class(struct configfs_dirent *sd,
 int configfs_create(struct dentry * dentry, umode_t mode, int (*init)(struct inode *))
 {
         int error = 0;
-        struct inode * inode = NULL;
-        if (dentry) {
-                if (!dentry->d_inode) {
-                        struct configfs_dirent *sd = dentry->d_fsdata;
-                        if ((inode = configfs_new_inode(mode, sd, dentry->d_sb))) {
-                                if (dentry->d_parent && dentry->d_parent->d_inode) {
-                                        struct inode *p_inode = dentry->d_parent->d_inode;
-                                        p_inode->i_mtime = p_inode->i_ctime = CURRENT_TIME;
-                                }
-                                configfs_set_inode_lock_class(sd, inode);
-                                goto Proceed;
-                        }
-                        else
-                                error = -ENOMEM;
-                } else
-                        error = -EEXIST;
-        } else
-                error = -ENOENT;
-        goto Done;
+        struct inode *inode = NULL;
+        struct configfs_dirent *sd;
+        struct inode *p_inode;
+
+        if (!dentry)
+                return -ENOENT;
+
+        if (dentry->d_inode)
+                return -EEXIST;
 
- Proceed:
-        if (init)
+        sd = dentry->d_fsdata;
+        inode = configfs_new_inode(mode, sd, dentry->d_sb);
+        if (!inode)
+                return -ENOMEM;
+
+        p_inode = dentry->d_parent->d_inode;
+        p_inode->i_mtime = p_inode->i_ctime = CURRENT_TIME;
+        configfs_set_inode_lock_class(sd, inode);
+
+        if (init) {
                 error = init(inode);
-        if (!error) {
-                d_instantiate(dentry, inode);
-                if (S_ISDIR(mode) || S_ISLNK(mode))
-                        dget(dentry);  /* pin link and directory dentries in core */
-        } else
-                iput(inode);
- Done:
+                if (error) {
+                        iput(inode);
+                        return error;
+                }
+        }
+        d_instantiate(dentry, inode);
+        if (S_ISDIR(mode) || S_ISLNK(mode))
+                dget(dentry);  /* pin link and directory dentries in core */
         return error;
 }