lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cifs: remove Local_System_Name

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

Signed-off-by: Jeff Layton <jlayton@redhat.com>
Signed-off-by: Steve French <sfrench@us.ibm.com>
This commit is contained in:
Jeff Layton
2010-11-22 15:31:03 -05:00
committed by Steve French
parent 79df1baeec
commit 8846399968
3 changed files with 10 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
fs/cifs/cifsfs.c
View File

@@ -937,7 +937,6 @@ init_cifs(void)
GlobalCurrentXid = 0; GlobalCurrentXid = 0;
GlobalTotalActiveXid = 0; GlobalTotalActiveXid = 0;
GlobalMaxActiveXid = 0; GlobalMaxActiveXid = 0;
memset(Local_System_Name, 0, 15);
spin_lock_init(&cifs_tcp_ses_lock); spin_lock_init(&cifs_tcp_ses_lock);
spin_lock_init(&cifs_file_list_lock); spin_lock_init(&cifs_file_list_lock);
spin_lock_init(&GlobalMid_Lock); spin_lock_init(&GlobalMid_Lock);

2
fs/cifs/cifsglob.h
View File

@@ -756,8 +756,6 @@ GLOBAL_EXTERN unsigned int GlobalTotalActiveXid; /* prot by GlobalMid_Sem */
GLOBAL_EXTERN unsigned int GlobalMaxActiveXid; /* prot by GlobalMid_Sem */ GLOBAL_EXTERN unsigned int GlobalMaxActiveXid; /* prot by GlobalMid_Sem */
GLOBAL_EXTERN spinlock_t GlobalMid_Lock; /* protects above & list operations */ GLOBAL_EXTERN spinlock_t GlobalMid_Lock; /* protects above & list operations */
/* on midQ entries */ /* on midQ entries */
GLOBAL_EXTERN char Local_System_Name[15];
/* /*
* Global counters, updated atomically * Global counters, updated atomically
*/ */

19
fs/cifs/connect.c
View File

@@ -807,23 +807,20 @@ cifs_parse_mount_options(char *options, const char *devname,
short int override_gid = -1; short int override_gid = -1;
bool uid_specified = false; bool uid_specified = false;
bool gid_specified = false; bool gid_specified = false;
char *nodename = utsname()->nodename;
separator[0] = ','; separator[0] = ',';
separator[1] = 0; separator[1] = 0;
if (Local_System_Name[0] != 0) /*
memcpy(vol->source_rfc1001_name, Local_System_Name, 15); * does not have to be perfect mapping since field is
else { * informational, only used for servers that do not support
char *nodename = utsname()->nodename; * port 445 and it can be overridden at mount time
int n = strnlen(nodename, 15); */
memset(vol->source_rfc1001_name, 0x20, 15); memset(vol->source_rfc1001_name, 0x20, 15);
for (i = 0; i < n; i++) { for (i = 0; i < strnlen(nodename, 15); 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 */
vol->source_rfc1001_name[i] = toupper(nodename[i]); vol->source_rfc1001_name[i] = toupper(nodename[i]);
}
}
vol->source_rfc1001_name[15] = 0; vol->source_rfc1001_name[15] = 0;
/* null target name indicates to use *SMBSERVR default called name /* null target name indicates to use *SMBSERVR default called name
if we end up sending RFC1001 session initialize */ if we end up sending RFC1001 session initialize */