From c9a12ea76eeb2d4677d4bbac16abf1473ba4fb7e Mon Sep 17 00:00:00 2001
From: Al Viro <viro@zeniv.linux.org.uk>
Date: Mon, 3 Nov 2008 15:03:50 -0500
Subject: [PATCH] --- yaml --- r: 124995 b: refs/heads/master c:
 dc711ca35f9d95a1eec02118e0c298b5e3068315 h: refs/heads/master i:   124993:
 a7fe00ccc6b6a581ab38190f923b0a0fb9b8ad04   124991:
 b320c0958ebd31aed6fda4a7f492d5d8cf0496f0 v: v3

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

diff --git a/[refs] b/[refs]
index 0cbf64c98dc8..ceaffebfa852 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7df5fa06de89a4ac311957e0cb9c1d87552b4325
+refs/heads/master: dc711ca35f9d95a1eec02118e0c298b5e3068315
diff --git a/trunk/fs/dcache.c b/trunk/fs/dcache.c
index fd244c7a7cc0..eeafc14c2a14 100644
--- a/trunk/fs/dcache.c
+++ b/trunk/fs/dcache.c
@@ -1616,8 +1616,11 @@ static void switch_names(struct dentry *dentry, struct dentry *target)
 			 */
 			memcpy(dentry->d_iname, target->d_name.name,
 					target->d_name.len + 1);
+			dentry->d_name.len = target->d_name.len;
+			return;
 		}
 	}
+	do_switch(dentry->d_name.len, target->d_name.len);
 }
 
 /*
@@ -1677,7 +1680,6 @@ static void d_move_locked(struct dentry * dentry, struct dentry * target)
 
 	/* Switch the names.. */
 	switch_names(dentry, target);
-	do_switch(dentry->d_name.len, target->d_name.len);
 	do_switch(dentry->d_name.hash, target->d_name.hash);
 
 	/* ... and switch the parents */
@@ -1787,7 +1789,6 @@ static void __d_materialise_dentry(struct dentry *dentry, struct dentry *anon)
 	struct dentry *dparent, *aparent;
 
 	switch_names(dentry, anon);
-	do_switch(dentry->d_name.len, anon->d_name.len);
 	do_switch(dentry->d_name.hash, anon->d_name.hash);
 
 	dparent = dentry->d_parent;