From 0bd4d433750f4687c992a69ee7acaeda23fd14cd Mon Sep 17 00:00:00 2001
From: Tom Goff <thomas.goff@boeing.com>
Date: Wed, 4 Apr 2012 12:06:20 -0700
Subject: [PATCH] --- yaml --- r: 299089 b: refs/heads/master c:
 70fa4a62e913dde2d100e0be2711562742f58bee h: refs/heads/master i:   299087:
 aa6d82f4ae1ffe06132eccd2d337e1272f3a16c7 v: v3

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

diff --git a/[refs] b/[refs]
index 1b6d867713c2..96475217978e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3a4ffe930a2d2dad07604fe74d21b878decc6461
+refs/heads/master: 70fa4a62e913dde2d100e0be2711562742f58bee
diff --git a/trunk/fs/sysfs/dir.c b/trunk/fs/sysfs/dir.c
index 2a7a3f5d1ca6..8ddc1021c79a 100644
--- a/trunk/fs/sysfs/dir.c
+++ b/trunk/fs/sysfs/dir.c
@@ -878,7 +878,6 @@ int sysfs_rename(struct sysfs_dirent *sd,
 
 		dup_name = sd->s_name;
 		sd->s_name = new_name;
-		sd->s_hash = sysfs_name_hash(sd->s_ns, sd->s_name);
 	}
 
 	/* Move to the appropriate place in the appropriate directories rbtree. */
@@ -886,6 +885,7 @@ int sysfs_rename(struct sysfs_dirent *sd,
 	sysfs_get(new_parent_sd);
 	sysfs_put(sd->s_parent);
 	sd->s_ns = new_ns;
+	sd->s_hash = sysfs_name_hash(sd->s_ns, sd->s_name);
 	sd->s_parent = new_parent_sd;
 	sysfs_link_sibling(sd);