diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2014-09-11 18:55:50 -0400 |
|---|---|---|
| committer | Jiri Slaby <jslaby@suse.cz> | 2017-01-27 17:14:59 +0100 |
| commit | 75e8aab4ba77c566a538bd85b0324ae71cc5a5ed (patch) | |
| tree | 463aeb5d28a643ebb5b5c0f9190cdc035d02cf1a /fs | |
| parent | 77eed17655f6176a74b70005a337127838057235 (diff) | |
move the call of __d_drop(anon) into __d_materialise_unique(dentry, anon)
commit 6f18493e541c690169c3b1479d47d95f624161cf upstream.
and lock the right list there
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Acked-by: NeilBrown <neilb@suse.com>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/dcache.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/fs/dcache.c b/fs/dcache.c index 11ded5b0b853..9a5e9082feb1 100644 --- a/fs/dcache.c +++ b/fs/dcache.c @@ -2623,6 +2623,12 @@ static void __d_materialise_dentry(struct dentry *dentry, struct dentry *anon) dentry->d_parent = dentry; list_del_init(&dentry->d_child); anon->d_parent = dparent; + if (likely(!d_unhashed(anon))) { + hlist_bl_lock(&anon->d_sb->s_anon); + __hlist_bl_del(&anon->d_hash); + anon->d_hash.pprev = NULL; + hlist_bl_unlock(&anon->d_sb->s_anon); + } list_move(&anon->d_child, &dparent->d_subdirs); write_seqcount_end(&dentry->d_seq); @@ -2677,7 +2683,6 @@ struct dentry *d_materialise_unique(struct dentry *dentry, struct inode *inode) * could splice into our tree? */ __d_materialise_dentry(dentry, alias); write_sequnlock(&rename_lock); - __d_drop(alias); goto found; } else { /* Nope, but we must(!) avoid directory |