patch-2.4.0-test12 linux/fs/ncpfs/ioctl.c

• Lines: 32
• Date: Mon Dec 11 12:59:28 2000
• Orig file: v2.4.0-test11/linux/fs/ncpfs/ioctl.c
• Orig date: Sun Nov 19 18:44:18 2000

diff -u --recursive --new-file v2.4.0-test11/linux/fs/ncpfs/ioctl.c linux/fs/ncpfs/ioctl.c
@@ -165,7 +165,6 @@
 			return 0;
 		}
 
-#ifdef CONFIG_NCPFS_MOUNT_SUBDIR
 	case NCP_IOC_GETROOT:
 		{
 			struct ncp_setroot_ioctl sr;
@@ -241,7 +240,6 @@
 
 			return 0;
 		}
-#endif	/* CONFIG_NCPFS_MOUNT_SUBDIR */
 
 #ifdef CONFIG_NCPFS_PACKET_SIGNING	
 	case NCP_IOC_SIGN_INIT:
@@ -374,7 +372,6 @@
 		}
 #endif	/* CONFIG_NCPFS_IOCTL_LOCKING */
 
-#ifdef CONFIG_NCPFS_NDS_DOMAINS
 	case NCP_IOC_GETOBJECTNAME:
 		if (current->uid != server->m.mounted_uid) {
 			return -EACCES;
@@ -503,7 +500,6 @@
 			if (old) ncp_kfree_s(old, oldlen);
 			return 0;
 		}
-#endif	/* CONFIG_NCPFS_NDS_DOMAINS */
 
 #ifdef CONFIG_NCPFS_NLS
 /* Here we are select the iocharset and the codepage for NLS.