From: Steve French <sfrench@us.ibm.com>
Date: Fri, 21 Oct 2005 15:39:12 +0000 (-0700)
Subject: Merge with /pub/scm/linux/kernel/git/sfrench/cifs-2.6.git/
X-Git-Tag: v2.6.15-rc1~18^2~35^2~5
X-Git-Url: http://pilppa.org/gitweb/?a=commitdiff_plain;h=d6d3f5bc68be3c4ab84e6f1f9db92291da671504;p=linux-2.6-omap-h63xx.git

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

d6d3f5bc68be3c4ab84e6f1f9db92291da671504
diff --cc fs/cifs/cifsfs.c
index 1ebf7dafc1d,d2d16a9c1f0..877095a1192
--- a/fs/cifs/cifsfs.c
+++ b/fs/cifs/cifsfs.c
@@@ -781,11 -816,9 +816,9 @@@ static int cifs_oplock_thread(void * du
  
  	oplockThread = current;
  	do {
 -		if(try_to_freeze()) 
 +		if (try_to_freeze()) 
  			continue;
- 		set_current_state(TASK_INTERRUPTIBLE);
  		
- 		schedule_timeout(1*HZ);  
  		spin_lock(&GlobalMid_Lock);
  		if(list_empty(&GlobalOplock_Q)) {
  			spin_unlock(&GlobalMid_Lock);
diff --cc fs/cifs/connect.c
index 47360156cc5,a8f0cbada0f..d74367a08d5
--- a/fs/cifs/connect.c
+++ b/fs/cifs/connect.c
@@@ -1319,11 -1403,17 +1403,17 @@@ ipv4_connect(struct sockaddr_in *psin_s
  		sessinit is sent but no second negprot */
  		struct rfc1002_session_packet * ses_init_buf;
  		struct smb_hdr * smb_buf;
 -		ses_init_buf = kcalloc(1, sizeof(struct rfc1002_session_packet), GFP_KERNEL);
 +		ses_init_buf = kzalloc(sizeof(struct rfc1002_session_packet), GFP_KERNEL);
  		if(ses_init_buf) {
  			ses_init_buf->trailer.session_req.called_len = 32;
- 			rfc1002mangle(ses_init_buf->trailer.session_req.called_name,
- 				DEFAULT_CIFS_CALLED_NAME,16);
+ 			if(target_name && (target_name[0] != 0)) {
+ 				rfc1002mangle(ses_init_buf->trailer.session_req.called_name,
+ 					target_name, 16);
+ 			} else {
+ 				rfc1002mangle(ses_init_buf->trailer.session_req.called_name,
+ 					DEFAULT_CIFS_CALLED_NAME,16);
+ 			}
+ 
  			ses_init_buf->trailer.session_req.calling_len = 32;
  			/* calling name ends in null (byte 16) from old smb
  			convention. */