Make __d_materialise_dentry() set the materialised dentry name correctly by
flipping the arguments to switch_names().
switch_names() is lazy: if both names are internal to their dentries, it'll
overwrite that of the first dentry with that of the second, and won't update
that of the second.
In the case of __d_materialise_dentry(), the second is an already extant
anonymous dentry that we want to insert into the tree in place of the dentry we
just looked up[*]. However, the dentry we just looked up carries the name we
actually want to use.
[*] This is used by NFS to join a mount of a subtree into a mount of a tree
nearer the root when the two meet, where both mounts share a superblock and
thus a set of dentries.
Signed-off-by: David Howells <dhowells@xxxxxxxxxx>
---
fs/dcache.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/fs/dcache.c b/fs/dcache.c
index 3ee588d..8ae660e 100644
--- a/fs/dcache.c
+++ b/fs/dcache.c
@@ -1649,7 +1649,7 @@ static void __d_materialise_dentry(struct dentry *dentry, struct dentry *anon)
{
struct dentry *dparent, *aparent;
- switch_names(dentry, anon);
+ switch_names(anon, dentry);
do_switch(dentry->d_name.len, anon->d_name.len);
do_switch(dentry->d_name.hash, anon->d_name.hash);
--
To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
