fold swapping ->d_name.hash into switch_names()

torvalds · Al Viro · commit a28ddb87cddd · 2014-09-27T15:59:11.000-04:00
and do it along with -&gt;d_name.len there

Signed-off-by: Linus Torvalds &lt;torvalds@linux-foundation.org&gt;
Signed-off-by: Al Viro &lt;viro@zeniv.linux.org.uk&gt;
diff --git a/fs/dcache.c b/fs/dcache.c
@@ -2412,7 +2412,7 @@ static void switch_names(struct dentry *dentry, struct dentry *target)
 			}
 		}
 	}
-	swap(dentry->d_name.len, target->d_name.len);
+	swap(dentry->d_name.hash_len, target->d_name.hash_len);
 }
 
 static void dentry_lock_for_move(struct dentry *dentry, struct dentry *target)
@@ -2510,7 +2510,6 @@ static void __d_move(struct dentry *dentry, struct dentry *target,
 
 	/* Switch the names.. */
 	switch_names(dentry, target);
-	swap(dentry->d_name.hash, target->d_name.hash);
 
 	/* ... and switch them in the tree */
 	if (IS_ROOT(dentry)) {

Original file line number	Diff line number	Diff line change
`@@ -2412,7 +2412,7 @@ static void switch_names(struct dentry dentry, struct dentry target)`
`2412`	`2412`	`}`
`2413`	`2413`	`}`
`2414`	`2414`	`}`
`2415`		`- swap(dentry->d_name.len, target->d_name.len);`
	`2415`	`+ swap(dentry->d_name.hash_len, target->d_name.hash_len);`
`2416`	`2416`	`}`
`2417`	`2417`
`2418`	`2418`	`static void dentry_lock_for_move(struct dentry dentry, struct dentry target)`
`@@ -2510,7 +2510,6 @@ static void __d_move(struct dentry dentry, struct dentry target,`
`2510`	`2510`
`2511`	`2511`	`/* Switch the names.. */`
`2512`	`2512`	`switch_names(dentry, target);`
`2513`		`- swap(dentry->d_name.hash, target->d_name.hash);`
`2514`	`2513`
`2515`	`2514`	`/* ... and switch them in the tree */`
`2516`	`2515`	`if (IS_ROOT(dentry)) {`