Commit 88463999 authored by Jeff Layton's avatar Jeff Layton Committed by Steve French
Browse files

cifs: remove Local_System_Name 



...this string is zeroed out and nothing ever changes it.

Signed-off-by: default avatarJeff Layton <jlayton@redhat.com>
Signed-off-by: default avatarSteve French <sfrench@us.ibm.com>
parent 79df1bae

fs/cifs/cifsfs.c

+0 −1
Original line number Diff line number Diff line
@@ -937,7 +937,6 @@ init_cifs(void) 
	GlobalCurrentXid = 0;

	GlobalTotalActiveXid = 0;

	GlobalMaxActiveXid = 0;

	memset(Local_System_Name, 0, 15);

	spin_lock_init(&cifs_tcp_ses_lock);

	spin_lock_init(&cifs_file_list_lock);

	spin_lock_init(&GlobalMid_Lock);

fs/cifs/cifsglob.h

+0 −2
Original line number Diff line number Diff line
@@ -756,8 +756,6 @@ GLOBAL_EXTERN unsigned int GlobalTotalActiveXid; /* prot by GlobalMid_Sem */ 
GLOBAL_EXTERN unsigned int GlobalMaxActiveXid;	/* prot by GlobalMid_Sem */

GLOBAL_EXTERN spinlock_t GlobalMid_Lock;  /* protects above & list operations */

					  /* on midQ entries */

GLOBAL_EXTERN char Local_System_Name[15];



/*

 *  Global counters, updated atomically

 */

fs/cifs/connect.c

+10 −13
Original line number Diff line number Diff line
@@ -807,23 +807,20 @@ cifs_parse_mount_options(char *options, const char *devname, 
	short int override_gid = -1;

	bool uid_specified = false;

	bool gid_specified = false;

	char *nodename = utsname()->nodename;



	separator[0] = ',';

	separator[1] = 0;



	if (Local_System_Name[0] != 0)

		memcpy(vol->source_rfc1001_name, Local_System_Name, 15);

	else {

		char *nodename = utsname()->nodename;

		int n = strnlen(nodename, 15);

	/*

	 * does not have to be perfect mapping since field is

	 * informational, only used for servers that do not support

	 * port 445 and it can be overridden at mount time

	 */

	memset(vol->source_rfc1001_name, 0x20, 15);

		for (i = 0; i < n; i++) {

			/* does not have to be perfect mapping since field is

			informational, only used for servers that do not support

			port 445 and it can be overridden at mount time */

	for (i = 0; i < strnlen(nodename, 15); i++)

		vol->source_rfc1001_name[i] = toupper(nodename[i]);

		}

	}



	vol->source_rfc1001_name[15] = 0;

	/* null target name indicates to use *SMBSERVR default called name

	   if we end up sending RFC1001 session initialize */