X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=fs%2Fconfigfs%2Fdir.c;h=5e6e37e58f36f5369201f0bb0482957beab20fdc;hb=5b982c5bb7db5cfbc15236d9d45cec32e5472ed5;hp=34750d5e4ff2c4b0b6b3bc841fdcb016db5f5d62;hpb=ebaf0c6032f525ddb0158fb59848d41899dce8cd;p=powerpc.git

diff --git a/fs/configfs/dir.c b/fs/configfs/dir.c
index 34750d5e4f..5e6e37e58f 100644
--- a/fs/configfs/dir.c
+++ b/fs/configfs/dir.c
@@ -1141,25 +1141,22 @@ int configfs_register_subsystem(struct configfs_subsystem *subsys)
 
 	err = -ENOMEM;
 	dentry = d_alloc(configfs_sb->s_root, &name);
-	if (!dentry)
-		goto out_release;
-
-	d_add(dentry, NULL);
+	if (dentry) {
+		d_add(dentry, NULL);
 
-	err = configfs_attach_group(sd->s_element, &group->cg_item,
-				    dentry);
-	if (!err)
-		dentry = NULL;
-	else
-		d_delete(dentry);
+		err = configfs_attach_group(sd->s_element, &group->cg_item,
+					    dentry);
+		if (err) {
+			d_delete(dentry);
+			dput(dentry);
+		}
+	}
 
 	mutex_unlock(&configfs_sb->s_root->d_inode->i_mutex);
 
-	if (dentry) {
-	    dput(dentry);
-out_release:
-	    unlink_group(group);
-	    configfs_release_fs();
+	if (err) {
+		unlink_group(group);
+		configfs_release_fs();
 	}
 
 	return err;