From d08c377eed8e5e801a58078cf85eff9c559b1731 Mon Sep 17 00:00:00 2001 From: Al Viro Date: Wed, 30 Jan 2013 10:13:38 -0500 Subject: [PATCH] --- yaml --- r: 359164 b: refs/heads/master c: 740da42efa24ac00dfb40d2f02d9d7f7a485049b h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/dcache.c | 19 +++++-------------- 2 files changed, 6 insertions(+), 15 deletions(-) diff --git a/[refs] b/[refs] index 655931dbca71..1ecec4f5cae8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 54c807e71d5ac59dee56c685f2b66e27cd54c475 +refs/heads/master: 740da42efa24ac00dfb40d2f02d9d7f7a485049b diff --git a/trunk/fs/dcache.c b/trunk/fs/dcache.c index 0e4b5fa6c9f9..ada6123414ae 100644 --- a/trunk/fs/dcache.c +++ b/trunk/fs/dcache.c @@ -2394,7 +2394,7 @@ static struct dentry *__d_unalias(struct inode *inode, */ static void __d_materialise_dentry(struct dentry *dentry, struct dentry *anon) { - struct dentry *dparent, *aparent; + struct dentry *dparent; 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); dparent = dentry->d_parent; - aparent = anon->d_parent; switch_names(dentry, anon); swap(dentry->d_name.hash, anon->d_name.hash); - dentry->d_parent = (aparent == anon) ? dentry : aparent; - list_del(&dentry->d_u.d_child); - if (!IS_ROOT(dentry)) - 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; + dentry->d_parent = dentry; + list_del_init(&dentry->d_u.d_child); + anon->d_parent = dparent; list_del(&anon->d_u.d_child); - if (!IS_ROOT(anon)) - list_add(&anon->d_u.d_child, &anon->d_parent->d_subdirs); - else - INIT_LIST_HEAD(&anon->d_u.d_child); + list_add(&anon->d_u.d_child, &dparent->d_subdirs); write_seqcount_end(&dentry->d_seq); write_seqcount_end(&anon->d_seq);