summaryrefslogtreecommitdiffstats
path: root/fs/msdos
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2000-06-15 01:55:58 +0000
committerRalf Baechle <ralf@linux-mips.org>2000-06-15 01:55:58 +0000
commit53b3988d474435254a3b053a68bb24ce9e439295 (patch)
treef8da8e40f01f4ad02bbd76b8c9920749b118235f /fs/msdos
parentb0cb48abe83d1a4389ea938bf624f8baa82c5047 (diff)
Merge with 2.3.99-pre9.
Diffstat (limited to 'fs/msdos')
-rw-r--r--fs/msdos/namei.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/fs/msdos/namei.c b/fs/msdos/namei.c
index 612bd6597..bcb40df90 100644
--- a/fs/msdos/namei.c
+++ b/fs/msdos/namei.c
@@ -337,7 +337,6 @@ int msdos_rmdir(struct inode *dir, struct dentry *dentry)
dir->i_nlink--;
mark_inode_dirty(inode);
mark_inode_dirty(dir);
- d_delete(dentry);
res = 0;
rmdir_done:
@@ -432,7 +431,6 @@ int msdos_unlink( struct inode *dir, struct dentry *dentry)
inode->i_ctime = dir->i_ctime = dir->i_mtime = CURRENT_TIME;
mark_inode_dirty(inode);
mark_inode_dirty(dir);
- d_delete(dentry); /* This also frees the inode */
res = 0;
unlink_done:
return res;