summaryrefslogtreecommitdiffstats
path: root/fs/minix/namei.c
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>1997-09-12 01:29:55 +0000
committerRalf Baechle <ralf@linux-mips.org>1997-09-12 01:29:55 +0000
commit545f435ebcfd94a1e7c20b46efe81b4d6ac4e698 (patch)
treee9ce4bc598d06374bda906f18365984bf22a526a /fs/minix/namei.c
parent4291a610eef89d0d5c69d9a10ee6560e1aa36c74 (diff)
Merge with Linux 2.1.55. More bugfixes and goodies from my private
CVS archive.
Diffstat (limited to 'fs/minix/namei.c')
-rw-r--r--fs/minix/namei.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/minix/namei.c b/fs/minix/namei.c
index 19c7df247..dbd9e9ce4 100644
--- a/fs/minix/namei.c
+++ b/fs/minix/namei.c
@@ -754,8 +754,7 @@ start_up:
}
}
/* Update the dcache */
- d_move(old_dentry, new_dentry->d_parent, &new_dentry->d_name);
- d_delete(new_dentry);
+ d_move(old_dentry, new_dentry);
retval = 0;
end_rename:
brelse(dir_bh);