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

diff --cc fs/cifs/cifsfs.c
index 1ebf7dafc1d757128e4084d6a1794485399b7ecc,d2d16a9c1f05d340f6d7fae4f3cb2c731f0729b8..877095a1192ad8e13b7bffe6e041ab578346ec46
--- 1/fs/cifs/cifsfs.c
--- 2/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 47360156cc54f40a3f9d469725c8dc19331a106f,a8f0cbada0f0ac23dfa4e40126ba72de0147b795..d74367a08d513dd4cf6bb6a3aa090996972ea7f5
--- 1/fs/cifs/connect.c
--- 2/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. */

diff --cc fs/cifs/dir.c
Simple merge