From 53b3988d474435254a3b053a68bb24ce9e439295 Mon Sep 17 00:00:00 2001 From: Ralf Baechle Date: Thu, 15 Jun 2000 01:55:58 +0000 Subject: Merge with 2.3.99-pre9. --- fs/hpfs/namei.c | 2 -- 1 file changed, 2 deletions(-) (limited to 'fs/hpfs') diff --git a/fs/hpfs/namei.c b/fs/hpfs/namei.c index dee75d7d0..b09ad98ea 100644 --- a/fs/hpfs/namei.c +++ b/fs/hpfs/namei.c @@ -326,7 +326,6 @@ int hpfs_unlink(struct inode *dir, struct dentry *dentry) if (r != 2) { inode->i_nlink--; hpfs_unlock_2inodes(dir, inode); - d_delete(dentry); } else { /* no space for deleting, try to truncate file */ struct iattr newattrs; int err; @@ -388,7 +387,6 @@ int hpfs_rmdir(struct inode *dir, struct dentry *dentry) dir->i_nlink--; inode->i_nlink = 0; hpfs_unlock_2inodes(dir, inode); - d_delete(dentry); } else hpfs_unlock_2inodes(dir, inode); return r == 2 ? -ENOSPC : r == 1 ? -EFSERROR : 0; } -- cgit v1.2.3