patch-2.1.131 linux/fs/smbfs/dir.c

• Lines: 28
• Date: Tue Dec 1 22:09:46 1998
• Orig file: v2.1.130/linux/fs/smbfs/dir.c
• Orig date: Wed Aug 26 11:37:43 1998

diff -u --recursive --new-file v2.1.130/linux/fs/smbfs/dir.c linux/fs/smbfs/dir.c
@@ -479,22 +479,15 @@
 	smb_close(inode);
 
 	/*
-	 * Prune any child dentries so this dentry can become negative.
+	 * Check that nobody else is using the directory..
 	 */
-	if (dentry->d_count > 1) {
-		shrink_dcache_parent(dentry);
-		error = -EBUSY;
-		if (dentry->d_count > 1)
-			goto out;
- 	}
+	error = -EBUSY;
+	if (!list_empty(&dentry->d_hash))
+		goto out;
 
 	smb_invalid_dir_cache(dir);
 	error = smb_proc_rmdir(dentry);
-	if (!error)
-	{
-		smb_renew_times(dentry);
-		d_delete(dentry);
-	}
+
 out:
 	return error;
 }