Remove deprecated code from legacy sources

sources/legacy/Makefile-24

-#
-# Makefile for Linux CIFS VFS client 
-#
-O_TARGET := cifs.o
-
-obj-y := nterr.o md4.o md5.o netmisc.o smbdes.o smbencrypt.o asn1.o cifs_unicode.o cifsencrypt.o cifs_debug.o sess.o link.o cifssmb.o connect.o misc.o dir.o inode.o transport.o cifsfs24.o file.o readdir.o ioctl.o
-
-obj-m := $(O_TARGET)
-
-include $(TOPDIR)/Rules.make

sources/legacy/cifs_debug.c

@@ -463,8 +463,6 @@ static read_proc_t experimEnabled_read;
 static write_proc_t experimEnabled_write;
 static read_proc_t linuxExtensionsEnabled_read;
 static write_proc_t linuxExtensionsEnabled_write;
-static read_proc_t etersoft_read;
-static write_proc_t etersoft_write;
 
 void
 cifs_proc_init(void)
@@ -529,12 +527,6 @@ cifs_proc_init(void)
 	if (pde)
 		pde->write_proc = lookupFlag_write;
 
-	pde =
-	create_proc_read_entry("Etersoft", 0, proc_fs_cifs,
-				etersoft_read, NULL);
-	if (pde)
-		pde->write_proc = etersoft_write;
-
 /*	pde =
 	    create_proc_read_entry("NTLMV2Enabled", 0, proc_fs_cifs,
 				ntlmv2_enabled_read, NULL);
@@ -568,7 +560,6 @@ cifs_proc_clean(void)
 	remove_proc_entry("LinuxExtensionsEnabled", proc_fs_cifs);
 	remove_proc_entry("Experimental", proc_fs_cifs);
 	remove_proc_entry("LookupCacheEnabled", proc_fs_cifs);
-	remove_proc_entry("Etersoft",proc_fs_cifs);
 	remove_proc_entry("cifs", proc_root_fs);
 }
 
@@ -922,44 +913,4 @@ security_flags_write(struct file *file, const char __user *buffer,
 	/* BB should we turn on MAY flags for other MUST options? */
 	return count;
 }
-
-static int
-etersoft_read(char *page, char **start, off_t off,
-		     int count, int *eof, void *data)
-{
-	int len;
-
-	len = sprintf(page, "%d\n", etersoft_flag);
-
-	len -= off;
-	*start = page + off;
-
-	if (len > count)
-		len = count;
-	else
-		*eof = 1;
-
-	if (len < 0)
-		len = 0;
-
-	return len;
-}
-static int
-etersoft_write(struct file *file, const char __user *buffer,
-		      unsigned long count, void *data)
-{
-	char c;
-	int rc;
-
-	rc = get_user(c, buffer);
-	if (rc)
-		return rc;
-	if (c == '0' || c == 'n' || c == 'N')
-		etersoft_flag = 0;
-	else if (c == '1' || c == 'y' || c == 'Y')
-		etersoft_flag = 1;
-
-	return count;
-}
-
 #endif

sources/legacy/cifsfs.c

@@ -61,7 +61,6 @@ extern struct export_operations cifs_export_ops;
 int cifsFYI = 0;
 int cifsERROR = 1;
 int traceSMB = 0;
-unsigned int etersoft_flag = 1;
 unsigned int oplockEnabled = 1;
 unsigned int experimEnabled = 0;
 unsigned int linuxExtEnabled = 1;

sources/legacy/cifsglob.h

@@ -612,8 +612,6 @@ GLOBAL_EXTERN atomic_t smBufAllocCount;
 GLOBAL_EXTERN atomic_t midCount;
 
 /* Misc globals */
-GLOBAL_EXTERN unsigned int etersoft_flag; /* if enabled allows extended shared modes in open */
-
 GLOBAL_EXTERN unsigned int multiuser_mount; /* if enabled allows new sessions
 				to be established on existing mount if we
 				have the uid/password or Kerberos credential

sources/legacy/cifssmb.c

@@ -1187,11 +1187,10 @@ SMBLegacyOpen(const int xid, struct cifsTconInfo *tcon,
 	int name_len;
 	__u16 count;
 
-	if (etersoft_flag) {
-		printk("Etersoft: Do not use SMBLegacyOpen!\n");
-		return rc;
-	}
-
+#ifndef ETERSOFT_USE_SMB_LEGACY_OPEN
+	printk("Etersoft: Do not use SMBLegacyOpen!\n");
+	return rc;
+#else
 OldOpenRetry:
 	rc = smb_init(SMB_COM_OPEN_ANDX, 15, tcon, (void **) &pSMB,
 		      (void **) &pSMBr);
@@ -1291,6 +1290,7 @@ OldOpenRetry:
 	if (rc == -EAGAIN)
 		goto OldOpenRetry;
 	return rc;
+#endif
 }
 
 int

sources/legacy/file.c

@@ -111,8 +111,6 @@ static inline int cifs_get_disposition(unsigned int flags)
 
 static inline int cifs_get_share_flags(unsigned int flags)
 {
-	if (!etersoft_flag)
-		return FILE_SHARE_ALL;
 	return ((~(flags>>21))&7);
 }