__d_materialise_unique() is too generic
Its first argument is always non-root, while the second one is always root. Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
parent
54c807e71d
commit
740da42efa
19
fs/dcache.c
19
fs/dcache.c
|
@ -2394,7 +2394,7 @@ out_err:
|
||||||
*/
|
*/
|
||||||
static void __d_materialise_dentry(struct dentry *dentry, struct dentry *anon)
|
static void __d_materialise_dentry(struct dentry *dentry, struct dentry *anon)
|
||||||
{
|
{
|
||||||
struct dentry *dparent, *aparent;
|
struct dentry *dparent;
|
||||||
|
|
||||||
dentry_lock_for_move(anon, dentry);
|
dentry_lock_for_move(anon, dentry);
|
||||||
|
|
||||||
|
@ -2402,24 +2402,15 @@ static void __d_materialise_dentry(struct dentry *dentry, struct dentry *anon)
|
||||||
write_seqcount_begin(&anon->d_seq);
|
write_seqcount_begin(&anon->d_seq);
|
||||||
|
|
||||||
dparent = dentry->d_parent;
|
dparent = dentry->d_parent;
|
||||||
aparent = anon->d_parent;
|
|
||||||
|
|
||||||
switch_names(dentry, anon);
|
switch_names(dentry, anon);
|
||||||
swap(dentry->d_name.hash, anon->d_name.hash);
|
swap(dentry->d_name.hash, anon->d_name.hash);
|
||||||
|
|
||||||
dentry->d_parent = (aparent == anon) ? dentry : aparent;
|
dentry->d_parent = dentry;
|
||||||
list_del(&dentry->d_u.d_child);
|
list_del_init(&dentry->d_u.d_child);
|
||||||
if (!IS_ROOT(dentry))
|
anon->d_parent = dparent;
|
||||||
list_add(&dentry->d_u.d_child, &dentry->d_parent->d_subdirs);
|
|
||||||
else
|
|
||||||
INIT_LIST_HEAD(&dentry->d_u.d_child);
|
|
||||||
|
|
||||||
anon->d_parent = (dparent == dentry) ? anon : dparent;
|
|
||||||
list_del(&anon->d_u.d_child);
|
list_del(&anon->d_u.d_child);
|
||||||
if (!IS_ROOT(anon))
|
list_add(&anon->d_u.d_child, &dparent->d_subdirs);
|
||||||
list_add(&anon->d_u.d_child, &anon->d_parent->d_subdirs);
|
|
||||||
else
|
|
||||||
INIT_LIST_HEAD(&anon->d_u.d_child);
|
|
||||||
|
|
||||||
write_seqcount_end(&dentry->d_seq);
|
write_seqcount_end(&dentry->d_seq);
|
||||||
write_seqcount_end(&anon->d_seq);
|
write_seqcount_end(&anon->d_seq);
|
||||||
|
|
Loading…
Reference in New Issue