patch-2.1.131 linux/fs/ufs/namei.c

• Lines: 25
• Date: Tue Dec 1 13:52:19 1998
• Orig file: v2.1.130/linux/fs/ufs/namei.c
• Orig date: Fri Oct 23 22:01:22 1998

diff -u --recursive --new-file v2.1.130/linux/fs/ufs/namei.c linux/fs/ufs/namei.c
@@ -701,7 +701,6 @@
 	if (SWAB32(de->d_ino) != inode->i_ino)
 		goto end_rmdir;
 
-	down(&inode->i_sem);
 	/*
 	 * Prune any child dentries so that this dentry becomes negative.
 	 */
@@ -727,7 +726,6 @@
 		retval = ufs_delete_entry (dir, de, bh);
 		dir->i_version = ++event;
 	}
-	up(&inode->i_sem);
 	if (retval)
 		goto end_rmdir;
 	mark_buffer_dirty(bh, 1);
@@ -784,8 +782,6 @@
 		inode->i_sb->dq_op->initialize (inode, -1);
 
 	retval = -EPERM;
-	if (S_ISDIR(inode->i_mode))
-		goto end_unlink;
 	if (IS_APPEND(inode) || IS_IMMUTABLE(inode))
 		goto end_unlink;
 	if ((dir->i_mode & S_ISVTX) &&