From: Andrew Morton Signed-off-by: Andrew Morton --- fs/cifs/connect.c | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff -puN fs/cifs/connect.c~git-cifs-fixup fs/cifs/connect.c --- a/fs/cifs/connect.c~git-cifs-fixup +++ a/fs/cifs/connect.c @@ -771,27 +771,17 @@ cifs_parse_mount_options(char *options, separator[0] = ','; separator[1] = 0; -<<<<<<< HEAD/fs/cifs/connect.c - memset(vol->source_rfc1001_name,0x20,15); - for(i=0;i < strnlen(utsname()->nodename,15);i++) { - /* does not have to be a perfect mapping since the 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(utsname()->nodename[i]); -======= if(Local_System_Name[0] != 0) memcpy(vol->source_rfc1001_name, Local_System_Name,15); else { memset(vol->source_rfc1001_name,0x20,15); - for(i=0;i < strnlen(system_utsname.nodename,15);i++) { + for(i=0;i < strnlen(utsname()->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(system_utsname.nodename[i]); + toupper(utsname()->nodename[i]); } ->>>>>>> /fs/cifs/connect.c } vol->source_rfc1001_name[15] = 0; /* null target name indicates to use *SMBSERVR default called name _