patch-2.3.51 linux/fs/sysv/namei.c

• Lines: 19
• Date: Wed Mar 8 09:04:09 2000
• Orig file: v2.3.50/linux/fs/sysv/namei.c
• Orig date: Sat Feb 26 22:31:54 2000

diff -u --recursive --new-file v2.3.50/linux/fs/sysv/namei.c linux/fs/sysv/namei.c
@@ -389,7 +389,7 @@
 		retval = -ENOTEMPTY;
 		goto end_rmdir;
 	}
-	if (!list_empty(&dentry->d_hash)) {
+	if (!d_unhashed(dentry)) {
 		retval = -EBUSY;
 		goto end_rmdir;
 	}
@@ -552,6 +552,9 @@
 	}
 	if (S_ISDIR(old_inode->i_mode)) {
 		if (new_inode) {
+			retval = -EBUSY;
+			if (!d_unhashed(new_dentry))
+				goto end_rename;
 			retval = -ENOTEMPTY;
 			if (!empty_dir(new_inode))
 				goto end_rename;