Merge bk://jfs.bkbits.net/linux-2.5

into home.transmeta.com:/home/torvalds/v2.5/linux

Merge bk://jfs.bkbits.net/linux-2.5
into home.transmeta.com:/home/torvalds/v2.5/linux
fd4588d0 · Linus Torvalds · db469c8d · cb36441a · fd4588d0
Commit fd4588d0 authored Jul 28, 2002 by Linus Torvalds
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 4 deletions

fs/jfs/namei.c fs/jfs/namei.c +0 -4

No files found.
--- a/fs/jfs/namei.c
+++ b/fs/jfs/namei.c
@@ -399,8 +399,6 @@ int jfs_rmdir(struct inode *dip, struct dentry *dentry)
 	IWRITE_UNLOCK(dip);
-	d_delete(dentry);
      out2:
 	free_UCSname(&dname);
@@ -543,8 +541,6 @@ int jfs_unlink(struct inode *dip, struct dentry *dentry)
 	IWRITE_UNLOCK(dip);
-	d_delete(dentry);
      out1:
 	free_UCSname(&dname);
      out: