From fb0e76c5f2102be32a7d19bbade110a8b7491918 Mon Sep 17 00:00:00 2001
From: Patrick Mochel <mochel@osdl.org>
Date: Mon, 3 Mar 2003 05:11:30 -0600
Subject: [PATCH] sysfs: fix more merge breakage.

---
 fs/sysfs/inode.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/fs/sysfs/inode.c b/fs/sysfs/inode.c
index b40a0a4c2be7e..1c87b5507fa1e 100644
--- a/fs/sysfs/inode.c
+++ b/fs/sysfs/inode.c
@@ -51,6 +51,7 @@ int sysfs_create(struct dentry * dentry, int mode, int (*init)(struct inode *))
 				goto Proceed;
 			else 
 				error = -ENOMEM;
+		} else
 			error = -EEXIST;
 	} else 
 		error = -ENOENT;
@@ -97,6 +98,7 @@ void sysfs_hash_and_remove(struct dentry * dir, const char * name)
 
 			pr_debug("sysfs: Removing %s (%d)\n", victim->d_name.name,
 				 atomic_read(&victim->d_count));
+			/*
 			 * Drop reference from initial sysfs_get_dentry().
 			 */
 			dput(victim);
-- 
2.53.0