From b8e1b9d14d6275e6a1db501b88abc908d192d415 Mon Sep 17 00:00:00 2001
From: Tejun Heo <htejun@gmail.com>
Date: Wed, 16 Jan 2008 12:10:53 +0900
Subject: [PATCH] --- yaml --- r: 75519 b: refs/heads/master c:
 456ef1553cb2b06729d64c1d1f0f2bda34e9b201 h: refs/heads/master i:   75517:
 5d9578513d2c882fd193443340723dde44f89718   75515:
 d10a28a1e2dce759543c2f5249be152566933d36   75511:
 a178d0c589170671a6434dc5d24d9f5bbd9b4ac4   75503:
 440f4883ea928746e797bc6bffa2936e880a9212   75487:
 3159dbe1c2f6e375f4420aea74a903c781576937   75455:
 0574f19d0ca32b0803ffe44135c8a26d1127cd12   75391:
 6e6905c9a7286282d94143e03884a1ed805ee1e2   75263:
 37a838c64e712b77bf5c209dbda02f883d8d5b09 v: v3

---
 [refs]               | 2 +-
 trunk/fs/sysfs/dir.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index f66e9476ac69..7fd20106d133 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e49452c67703d3647467d65275fb893589384fed
+refs/heads/master: 456ef1553cb2b06729d64c1d1f0f2bda34e9b201
diff --git a/trunk/fs/sysfs/dir.c b/trunk/fs/sysfs/dir.c
index b197016bbfbe..f281cc6584b0 100644
--- a/trunk/fs/sysfs/dir.c
+++ b/trunk/fs/sysfs/dir.c
@@ -783,6 +783,7 @@ int sysfs_rename_dir(struct kobject * kobj, const char *new_name)
 	old_dentry = sysfs_get_dentry(sd);
 	if (IS_ERR(old_dentry)) {
 		error = PTR_ERR(old_dentry);
+		old_dentry = NULL;
 		goto out;
 	}
 
@@ -850,6 +851,7 @@ int sysfs_move_dir(struct kobject *kobj, struct kobject *new_parent_kobj)
 	old_dentry = sysfs_get_dentry(sd);
 	if (IS_ERR(old_dentry)) {
 		error = PTR_ERR(old_dentry);
+		old_dentry = NULL;
 		goto out;
 	}
 	old_parent = old_dentry->d_parent;
@@ -857,6 +859,7 @@ int sysfs_move_dir(struct kobject *kobj, struct kobject *new_parent_kobj)
 	new_parent = sysfs_get_dentry(new_parent_sd);
 	if (IS_ERR(new_parent)) {
 		error = PTR_ERR(new_parent);
+		new_parent = NULL;
 		goto out;
 	}
 
@@ -880,7 +883,6 @@ int sysfs_move_dir(struct kobject *kobj, struct kobject *new_parent_kobj)
 	error = 0;
 	d_add(new_dentry, NULL);
 	d_move(old_dentry, new_dentry);
-	dput(new_dentry);
 
 	/* Remove from old parent's list and insert into new parent's list. */
 	sysfs_unlink_sibling(sd);