diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-06-15 01:55:58 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-06-15 01:55:58 +0000 |
| commit | 53b3988d474435254a3b053a68bb24ce9e439295 (patch) | |
| tree | f8da8e40f01f4ad02bbd76b8c9920749b118235f /fs/hpfs | |
| parent | b0cb48abe83d1a4389ea938bf624f8baa82c5047 (diff) | |
Merge with 2.3.99-pre9.
Diffstat (limited to 'fs/hpfs')
| -rw-r--r-- | fs/hpfs/namei.c | 2 |
1 files changed, 0 insertions, 2 deletions
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; } |