patch-2.2.16 linux/fs/ncpfs/dir.c

• Lines: 22
• Date: Wed Jun 7 14:26:43 2000
• Orig file: v2.2.15/linux/fs/ncpfs/dir.c
• Orig date: Wed May 3 17:16:46 2000

diff -urN v2.2.15/linux/fs/ncpfs/dir.c linux/fs/ncpfs/dir.c
@@ -1018,9 +1018,9 @@
 
 	error = ncp_del_file_or_subdir2(NCP_SERVER(dir), dentry);
 #ifdef CONFIG_NCPFS_STRONG
-	/* 9C is Invalid path.. It should be 8F, 90 - read only, but
-	   it is not :-( */
-	if (error == 0x9C && NCP_SERVER(dir)->m.flags & NCP_MOUNT_STRONG) { /* R/O */
+	/* 9C is Invalid path, used by traditional NW filesystem... 
+	   8F, 90 is Some/All read-only and is used by NSS :-( */
+	if ((error == 0x9C || error == 0x8F || error == 0x90) && NCP_SERVER(dir)->m.flags & NCP_MOUNT_STRONG) { /* R/O */
 		error = ncp_force_unlink(dir, dentry);
 	}
 #endif
@@ -1085,7 +1085,7 @@
 					    old_dir, _old_name,
 					    new_dir, _new_name);
 #ifdef CONFIG_NCPFS_STRONG
-	if ((error == 0x90 || error == -EACCES) && NCP_SERVER(old_dir)->m.flags & NCP_MOUNT_STRONG) {	/* RO */
+	if ((error == 0x90 || error == 0x8B || error == -EACCES) && NCP_SERVER(old_dir)->m.flags & NCP_MOUNT_STRONG) {	/* RO */
 		error = ncp_force_rename(old_dir, old_dentry, _old_name,
                                          new_dir, new_dentry, _new_name);
 	}