summaryrefslogtreecommitdiffstats
path: root/fs/ufs
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/ufs
parentb0cb48abe83d1a4389ea938bf624f8baa82c5047 (diff)
Merge with 2.3.99-pre9.
Diffstat (limited to 'fs/ufs')
-rw-r--r--fs/ufs/namei.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/fs/ufs/namei.c b/fs/ufs/namei.c
index c60fcbcdb..2bd998cf3 100644
--- a/fs/ufs/namei.c
+++ b/fs/ufs/namei.c
@@ -673,7 +673,6 @@ static int ufs_rmdir (struct inode * dir, struct dentry *dentry)
dir->i_nlink--;
inode->i_ctime = dir->i_ctime = dir->i_mtime = CURRENT_TIME;
mark_inode_dirty(dir);
- d_delete(dentry);
end_rmdir:
brelse (bh);
@@ -730,7 +729,6 @@ static int ufs_unlink(struct inode * dir, struct dentry *dentry)
mark_inode_dirty(inode);
inode->i_ctime = dir->i_ctime;
retval = 0;
- d_delete(dentry); /* This also frees the inode */
end_unlink:
brelse (bh);