3.16.7-ckt3 -stable review patch. If anyone has any objections, please let me know.
------------------ From: Linus Torvalds <[email protected]> commit a28ddb87cdddb0db57466ba7f59f831002f4340c upstream. and do it along with ->d_name.len there Signed-off-by: Linus Torvalds <[email protected]> Signed-off-by: Al Viro <[email protected]> Signed-off-by: Stefan Bader <[email protected]> [ luis: used Stefan's backport to 3.16 ] Signed-off-by: Luis Henriques <[email protected]> --- fs/dcache.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/fs/dcache.c b/fs/dcache.c index f9cec9d4dbe0..8a7dcc895d99 100644 --- a/fs/dcache.c +++ b/fs/dcache.c @@ -2441,7 +2441,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) @@ -2540,7 +2540,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 the parents */ if (IS_ROOT(dentry)) { @@ -2679,7 +2678,6 @@ static void __d_materialise_dentry(struct dentry *dentry, struct dentry *anon) dparent = dentry->d_parent; switch_names(dentry, anon); - swap(dentry->d_name.hash, anon->d_name.hash); dentry->d_parent = dentry; list_del_init(&dentry->d_u.d_child); -- 2.1.3 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
