From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Fri, 13 Oct 2006 15:09:29 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6
X-Git-Tag: v2.6.19-rc2~10
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=12e36b2f41b6cbc67386fcb9c59c32a3e2033905;p=linux-2.6-omap-h63xx.git

Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6: (27 commits)
  [CIFS] Missing flags2 for DFS
  [CIFS] Workaround incomplete byte length returned by some
  [CIFS] cifs Kconfig: don't select CONNECTOR
  [CIFS] Level 1 QPathInfo needed for proper OS2 support
  [CIFS] fix typo in previous patch
  [CIFS] Fix old DOS time conversion to handle timezone
  [CIFS] Do not need to adjust for Jan/Feb for leap day
  [CIFS] Fix leaps year calculation for years after 2100
  [CIFS] readdir (ffirst) enablement of accurate timestamps from legacy servers
  [CIFS] Fix compiler warning with previous patch
  [CIFS] Fix typo
  [CIFS] Allow for 15 minute TZs (e.g. Nepal) and be more explicit about
  [CIFS] Fix readdir of large directories for backlevel servers
  [CIFS] Allow LANMAN21 support even in both POSIX non-POSIX path
  [CIFS] Make use of newer QFSInfo dependent on capability bit instead of
  [CIFS] Do not send newer QFSInfo to legacy servers which can not support it
  [CIFS] Fix typo in name of new cifs_show_stats
  [CIFS] Rename server time zone field
  [CIFS] Handle legacy servers which return undefined time zone
  [CIFS] CIFS support for /proc/<pid>/mountstats part 1
  ...

Manual conflict resolution in fs/cifs/connect.c
---

12e36b2f41b6cbc67386fcb9c59c32a3e2033905
diff --cc fs/cifs/connect.c
index c78762051da,1d17691086c..4093d533293
--- a/fs/cifs/connect.c
+++ b/fs/cifs/connect.c
@@@ -771,13 -771,17 +771,18 @@@ cifs_parse_mount_options(char *options
  	separator[0] = ',';
  	separator[1] = 0; 
  
- 	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)
++	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);
+ 		memset(vol->source_rfc1001_name,0x20,15);
 -		for(i=0;i < strnlen(system_utsname.nodename,15);i++) {
++		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 */
 -			vol->source_rfc1001_name[i] = 
 -				toupper(system_utsname.nodename[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