Merge fixes from version 0.58 of cifs vfs

fs/cifs/AUTHORS

@@ -14,3 +14,9 @@ and others for their work on the Linux smbfs module over the years. Thanks to
 the other members of the Storage Network Industry Association CIFS Technical
 Workgroup for their work specifying this highly complex protocol and finally
 thanks to the Samba team for their technical advice and encouragement.
+
+Patch Contributors
+------------------
+Zwane Mwaikambo
+Andi Kleen
+

fs/cifs/CHANGES

+Version 0.58
+------------
+Changed read and write to go through pagecache. Added additional address space operations.
+Memory mapped operations now working.
+
+Version 0.57
+------------
+Added writepage code for additional memory mapping support.  Fixed leak in xids causing
+the simultaneous operations counter (/proc/fs/cifs/SimultaneousOps) to increase on 
+every stat call.  Additional formatting cleanup. 
+
+Version 0.56
+------------
+Fix bigendian bug in order of time conversion. Merge 2.5 to 2.4 version.  Formatting cleanup.   
+
+Version 0.55
+------------
+Fixes from Zwane Mwaikambo for adding missing return code checking in a few places.
+Also included a modified version of his fix to protect global list manipulation of
+the smb session and tree connection and mid related global variables.
+
 Version 0.54
 ------------
 Fix problem with captive thread hanging around at unmount time.  Adjust to 2.5.42-pre

fs/cifs/TODO

@@ -31,9 +31,6 @@ i) support for the Linux 2.5 kernel new feature get_xattr and set_xattr
 
 j) finish off the mount helper, mount.cifs - (started)
 
-k) support for memory mapped files only partially works until support for
-MS_INVALIDATE implemented.  readpage and writepage code not finished (started)
-
 KNOWN BUGS (updated October 8nd, 2002)
 ====================================
 1) symbolic links (Windows reparse points) are recognized but
@@ -42,6 +39,8 @@ support the CIFS Unix extensions but Samba has a bug currently handling
 symlink text beginning with slash
 2) delete of file with read-only attribute set will fail (may be ok)
 3) autoreconnection logic is only partially complete.
+4) there may be a problem with truncating a memmapped file to smaller than 4k with
+the size being reported as exactly 4k.
 
 Misc testing to do
 =================

fs/cifs/cifsfs.c

@@ -115,7 +115,6 @@ cifs_put_super(struct super_block *sb)
 	struct cifs_sb_info *cifs_sb;
 
 	cFYI(1, ("In cifs_put_super\n"));
-        schedule_timeout(HZ*4);
 	cifs_sb = CIFS_SB(sb);
 	if(cifs_sb == NULL) {
 		cFYI(1,("\nEmpty cifs superblock info passed to unmount"));
@@ -159,7 +158,7 @@ cifs_statfs(struct super_block *sb, struct statfs *buf)
 	   __fsid_t f_fsid;
 	   int f_namelen;  */
 	/* BB get from info put in tcon struct at mount time with call to QFSAttrInfo */
-
+	FreeXid(xid);
 	return 0;		/* always return success? what if volume is no longer available? */
 }
 
@@ -180,7 +179,7 @@ cifs_alloc_inode(struct super_block *sb)
 	atomic_set(&cifs_inode->inUse, 0);
 	cifs_inode->time = 0;
 	cifs_inode->clientCanCache = 0;
-    INIT_LIST_HEAD(&cifs_inode->openFileList);
+	INIT_LIST_HEAD(&cifs_inode->openFileList);
 	return &cifs_inode->vfs_inode;
 }
 
@@ -262,6 +261,7 @@ static struct file_system_type cifs_fs_type = {
 struct inode_operations cifs_dir_inode_ops = {
 	.create = cifs_create,
 	.lookup = cifs_lookup,
+	.getattr = cifs_getattr,
 	.unlink = cifs_unlink,
 	.link = cifs_hardlink,
 	.mkdir = cifs_mkdir,
@@ -275,6 +275,7 @@ struct inode_operations cifs_dir_inode_ops = {
 struct inode_operations cifs_file_inode_ops = {
 /*	revalidate:cifs_revalidate, */
 	.setattr = cifs_setattr,
+	.getattr = cifs_getattr,
 	.rename = cifs_rename,
 };
 
@@ -282,17 +283,18 @@ struct inode_operations cifs_symlink_inode_ops = {
 	.readlink = cifs_readlink,
 	.follow_link = cifs_follow_link,
 	/* BB add the following two eventually */
-	/* revalidate:     cifs_revalidate,
-   setattr:        cifs_notify_change, *//* BB do we need notify change */
+	/* revalidate: cifs_revalidate,
+	   setattr:    cifs_notify_change, *//* BB do we need notify change */
 };
 
 struct file_operations cifs_file_ops = {
-	.read = cifs_read,
-	.write = cifs_write,
+	.read = generic_file_read,
+	.write = generic_file_write,
 	.open = cifs_open,
 	.release = cifs_close,
 	.lock = cifs_lock,
 	.fsync = cifs_fsync,
+	.mmap  = cifs_file_mmap,
 };
 
 struct file_operations cifs_dir_ops = {
@@ -426,7 +428,7 @@ exit_cifs(void)
 #if CONFIG_PROC_FS
 	cifs_proc_clean();
 #endif
-    unregister_filesystem(&cifs_fs_type);
+    	unregister_filesystem(&cifs_fs_type);
 	cifs_destroy_inodecache();
 	cifs_destroy_mids();
 	cifs_destroy_request_bufs();

fs/cifs/cifsfs.h

@@ -55,6 +55,7 @@ extern int cifs_rmdir(struct inode *, struct dentry *);
 extern int cifs_rename(struct inode *, struct dentry *, struct inode *,
 		       struct dentry *);
 extern int cifs_revalidate(struct dentry *);
+extern int cifs_getattr(struct vfsmount *, struct dentry *, struct kstat *);
 extern int cifs_setattr(struct dentry *, struct iattr *);
 
 extern struct inode_operations cifs_file_inode_ops;
@@ -73,7 +74,7 @@ extern ssize_t cifs_write(struct file *file, const char *write_data,
 			  size_t write_size, loff_t * poffset);
 extern int cifs_lock(struct file *, int, struct file_lock *);
 extern int cifs_fsync(struct file *, struct dentry *, int);
-
+extern int cifs_file_mmap(struct file * , struct vm_area_struct *);
 extern struct file_operations cifs_dir_ops;
 extern int cifs_dir_open(struct inode *inode, struct file *file);
 extern int cifs_readdir(struct file *file, void *direntry, filldir_t filldir);

fs/cifs/cifsglob.h

@@ -165,7 +165,7 @@ struct cifsSesInfo {
  */
 struct cifsTconInfo {
 	struct list_head cifsConnectionList;
-    struct list_head openFileList;
+	struct list_head openFileList;
 	struct semaphore tconSem;
 	struct cifsSesInfo *ses;	/* pointer to session associated with */
 	char treeName[MAX_TREE_SIZE + 1];	/* The ascii or unicode name of this resource depending on the ses->capabilities *//* BB fill in this field */
@@ -201,6 +201,7 @@ struct cifsFileInfo {
 	__u16 netfid;		/* file id from remote */
 	/* BB add lock scope info here if needed */ ;
 	/* lock scope id (0 if none) */
+    struct file * pfile; /* needed for writepage */
 	int endOfSearch:1;	/* we have reached end of search */
 	int closePend:1;	/* file is marked to close */
 };
@@ -212,12 +213,12 @@ struct cifsFileInfo {
 struct cifsInodeInfo {
 	struct list_head lockList;
 	/* BB add in lists for dirty pages - i.e. write caching info for oplock */
-    struct list_head openFileList;
+	struct list_head openFileList;
 	__u32 cifsAttrs;	/* e.g. DOS archive bit, sparse, compressed, system etc. */
 	atomic_t inUse;		/* num concurrent users (local openers cifs) of file */
 	unsigned long time;	/* jiffies of last update/check of inode */
 	int clientCanCache:1;	/* oplocked.  We need to extend cases beyond this i.e. what
-				   if file read-only or if file locked? or if file on r/o vol? */
+			   if file read-only or if file locked? or if file on r/o vol? */
 	struct inode vfs_inode;
 };
 
@@ -244,7 +245,7 @@ struct mid_q_entry {
 	struct cifsSesInfo *ses;	/* smb was sent to this server */
 	struct task_struct *tsk;	/* task waiting for response */
 	struct smb_hdr *resp_buf;	/* response buffer */
-	int midState;		/* wish this could be an enum but can not pass that to wait_event */
+	int midState;	/* wish this were enum but can not pass to wait_event */
 };
 
 #define   MID_FREE 0
@@ -304,7 +305,7 @@ GLOBAL_EXTERN unsigned int GlobalCurrentXid;	/* protected by GlobalMid_Sem */
 GLOBAL_EXTERN unsigned int GlobalTotalActiveXid;	/* prot by GlobalMid_Sem */
 GLOBAL_EXTERN unsigned int GlobalMaxActiveXid;	/* prot by GlobalMid_Sem */
 GLOBAL_EXTERN rwlock_t GlobalMid_Lock;  /* protects above and list operations */
-										/* on midQ entries */
+					/* on midQ entries */
 GLOBAL_EXTERN char Local_System_Name[15];
 
 /*
@@ -319,12 +320,12 @@ GLOBAL_EXTERN atomic_t midCount;
 
 /* Misc globals */
 GLOBAL_EXTERN unsigned int multiuser_mount;	/* if enabled allows new sessions
-									to be established on existing mount if we
-					                have the uid/password or Kerberos credential 
-									or equivalent for current user */
+				to be established on existing mount if we
+				have the uid/password or Kerberos credential 
+				or equivalent for current user */
 GLOBAL_EXTERN unsigned int oplockEnabled;
 GLOBAL_EXTERN unsigned int extended_security;	/* if on, session setup sent 
-									with more secure ntlmssp2 challenge/resp */
+				with more secure ntlmssp2 challenge/resp */
 GLOBAL_EXTERN unsigned int ntlmv2_support;  /* better optional password hash */
 GLOBAL_EXTERN unsigned int sign_CIFS_PDUs;  /* enable smb packet signing */
 

fs/cifs/cifssmb.c

@@ -487,7 +487,7 @@ CIFSSMBRead(const int xid, const struct cifsTconInfo *tcon,
 					 (tcon->ses->maxBuf -
 					  MAX_CIFS_HDR_SIZE) & 0xFFFFFF00));
 	pSMB->MaxCountHigh = 0;
-	pSMB->ByteCount = 0;	/* no need to do le conversion since it is 0 */
+	pSMB->ByteCount = 0;  /* no need to do le conversion since it is 0 */
 
 	rc = SendReceive(xid, tcon->ses, (struct smb_hdr *) pSMB,
 			 (struct smb_hdr *) pSMBr, &bytes_returned, 0);
@@ -497,16 +497,20 @@ CIFSSMBRead(const int xid, const struct cifsTconInfo *tcon,
 	} else {
 		pSMBr->DataLength = le16_to_cpu(pSMBr->DataLength);
 		*nbytes = pSMBr->DataLength;
-		/* BB check that DataLength would not go beyond end of SMB BB */
-		if (pSMBr->DataLength > CIFS_MAX_MSGSIZE + MAX_CIFS_HDR_SIZE) {
+		/*check that DataLength would not go beyond end of SMB */
+		if ((pSMBr->DataLength > CIFS_MAX_MSGSIZE) 
+				|| (pSMBr->DataLength > count)) {
 			rc = -EIO;
 			*nbytes = 0;
 		} else {
 			pReadData =
 			    (char *) (&pSMBr->hdr.Protocol) +
 			    le16_to_cpu(pSMBr->DataOffset);
-			if(copy_to_user(buf, pReadData, pSMBr->DataLength))
-                rc = -EFAULT;
+/*			if(rc = copy_to_user(buf, pReadData, pSMBr->DataLength)) {
+				cERROR(1,("\nFaulting on read rc = %d",rc));
+				rc = -EFAULT;
+			}*/ /* can not use copy_to_user when using page cache*/
+			memcpy(buf,pReadData,pSMBr->DataLength);
 		}
 	}
 
@@ -546,12 +550,7 @@ CIFSSMBWrite(const int xid, const struct cifsTconInfo *tcon,
 	pSMB->DataOffset =
 	    cpu_to_le16(offsetof(struct smb_com_write_req,Data) - 4);
 
-	if(copy_from_user(pSMB->Data, buf, pSMB->DataLengthLow)) {
-        buf_release(pSMB);
-        return -EFAULT;
-    }
-
-
+	memcpy(pSMB->Data,buf,pSMB->DataLengthLow);
 
 	pSMB->ByteCount += pSMB->DataLengthLow + 1 /* pad */ ;
 	pSMB->DataLengthLow = cpu_to_le16(pSMB->DataLengthLow);

fs/cifs/connect.c

@@ -736,18 +736,18 @@ cifs_mount(struct super_block *sb, struct cifs_sb_info *cifs_sb,
 				   && (pSesInfo->secType == RawNTLMSSP)) {
 				cFYI(1, ("\nNTLMSSP sesssetup "));
 				rc = CIFSNTLMSSPNegotiateSessSetup(xid,
-								   pSesInfo,
-								   cryptKey,
-								   volume_info.domainname,
-                                   &ntlmv2_flag,
-								   cifs_sb->local_nls);
+								pSesInfo,
+								cryptKey,
+								volume_info.domainname,
+								&ntlmv2_flag,
+								cifs_sb->local_nls);
 				if (!rc) {
-                    if(ntlmv2_flag) {
-                        cFYI(1,("\nAble to use the more secure NTLM version 2 password hash"));
-                        /* SMBNTv2encrypt( ...);  */ /* BB fix this up - 
-                        and note that Samba client equivalent looks wrong */
-                    } else
-					    SMBNTencrypt(password_with_pad,cryptKey,ntlm_session_key);
+					if(ntlmv2_flag) {
+						cFYI(1,("\nAble to use the more secure NTLM version 2 password hash"));
+				/* SMBNTv2encrypt( ...);  */ /* BB fix this up - 
+				   and note that Samba client equivalent looks wrong */
+					} else
+						SMBNTencrypt(password_with_pad,cryptKey,ntlm_session_key);
 
 					/* for better security the weaker lanman hash not sent 
                        in AuthSessSetup so why bother calculating it */
@@ -758,13 +758,13 @@ cifs_mount(struct super_block *sb, struct cifs_sb_info *cifs_sb,
 						   cryptKey, session_key); */
 
 					rc = CIFSNTLMSSPAuthSessSetup(xid,
-								      pSesInfo,
-								      volume_info.
-								      username,
-								      volume_info.domainname,
-								      ntlm_session_key,
-								      session_key,
-                                      ntlmv2_flag,
+								pSesInfo,
+								volume_info.
+								username,
+								volume_info.domainname,
+								ntlm_session_key,
+								session_key,
+								ntlmv2_flag,
 								      cifs_sb->local_nls);
 				}
 			} else {	/* old style NTLM 0.12 session setup */
@@ -821,6 +821,7 @@ cifs_mount(struct super_block *sb, struct cifs_sb_info *cifs_sb,
 								 "",
 								 cifs_sb->
 								 local_nls);
+					FreeXid(xid);
 					return -ENODEV;
 				} else {
 					rc = CIFSTCon(xid, pSesInfo,
@@ -909,8 +910,8 @@ CIFSSessSetup(unsigned int xid, struct cifsSesInfo *ses, char *user,
 	pSMB->req_no_secext.MaxBufferSize = cpu_to_le16(ses->maxBuf);
 	pSMB->req_no_secext.MaxMpxCount = cpu_to_le16(ses->maxReq);
 
-    if(ses->secMode & (SECMODE_SIGN_REQUIRED | SECMODE_SIGN_ENABLED))
-        smb_buffer->Flags2 |= SMBFLG2_SECURITY_SIGNATURE;
+	if(ses->secMode & (SECMODE_SIGN_REQUIRED | SECMODE_SIGN_ENABLED))
+		smb_buffer->Flags2 |= SMBFLG2_SECURITY_SIGNATURE;
 
 	pSMB->req_no_secext.Capabilities =
 	    CAP_LARGE_FILES | CAP_NT_SMBS | CAP_LEVEL_II_OPLOCKS;
@@ -944,8 +945,8 @@ CIFSSessSetup(unsigned int xid, struct cifsSesInfo *ses, char *user,
 			*bcc_ptr = 0;
 			bcc_ptr++;
 		}
-        if(user == NULL)
-            bytes_returned = 0; /* skill null user */
+		if(user == NULL)
+			bytes_returned = 0; /* skill null user */
         else
 		    bytes_returned =
 		        cifs_strtoUCS((wchar_t *) bcc_ptr, user, 100, nls_codepage);
@@ -976,10 +977,10 @@ CIFSSessSetup(unsigned int xid, struct cifsSesInfo *ses, char *user,
 		bcc_ptr += 2 * bytes_returned;
 		bcc_ptr += 2;
 	} else {
-        if(user != NULL) {                
+		if(user != NULL) {                
 		    strncpy(bcc_ptr, user, 200);
 		    bcc_ptr += strnlen(user, 200);
-        }
+		}
 		*bcc_ptr = 0;
 		bcc_ptr++;
 		if (domain == NULL) {
@@ -1081,7 +1082,6 @@ CIFSSessSetup(unsigned int xid, struct cifsSesInfo *ses, char *user,
 						    kcalloc(2, GFP_KERNEL);
 					}
 				} else {	/* ASCII */
-
 					len = strnlen(bcc_ptr, 1024);
 					if (((long) bcc_ptr + len) - (long)
 					    pByteArea(smb_buffer_response)
@@ -1164,8 +1164,8 @@ CIFSSpnegoSessSetup(unsigned int xid, struct cifsSesInfo *ses,
 	pSMB->req.MaxBufferSize = cpu_to_le16(ses->maxBuf);
 	pSMB->req.MaxMpxCount = cpu_to_le16(ses->maxReq);
 
-    if(ses->secMode & (SECMODE_SIGN_REQUIRED | SECMODE_SIGN_ENABLED))
-        smb_buffer->Flags2 |= SMBFLG2_SECURITY_SIGNATURE;
+	if(ses->secMode & (SECMODE_SIGN_REQUIRED | SECMODE_SIGN_ENABLED))
+		smb_buffer->Flags2 |= SMBFLG2_SECURITY_SIGNATURE;
 
 	pSMB->req.Capabilities =
 	    CAP_LARGE_FILES | CAP_NT_SMBS | CAP_LEVEL_II_OPLOCKS |
@@ -1410,7 +1410,7 @@ CIFSNTLMSSPNegotiateSessSetup(unsigned int xid,
 	PCHALLENGE_MESSAGE SecurityBlob2;
 
 	cFYI(1, ("\nIn NTLMSSP sesssetup (negotiate) "));
-    *pNTLMv2_flag = FALSE;
+	*pNTLMv2_flag = FALSE;
 	smb_buffer = buf_get();
 	if (smb_buffer == 0) {
 		return -ENOMEM;
@@ -1429,8 +1429,8 @@ CIFSNTLMSSPNegotiateSessSetup(unsigned int xid,
 	pSMB->req.MaxBufferSize = cpu_to_le16(ses->maxBuf);
 	pSMB->req.MaxMpxCount = cpu_to_le16(ses->maxReq);
 
-    if(ses->secMode & (SECMODE_SIGN_REQUIRED | SECMODE_SIGN_ENABLED))
-        smb_buffer->Flags2 |= SMBFLG2_SECURITY_SIGNATURE;
+	if(ses->secMode & (SECMODE_SIGN_REQUIRED | SECMODE_SIGN_ENABLED))
+		smb_buffer->Flags2 |= SMBFLG2_SECURITY_SIGNATURE;
 
 	pSMB->req.Capabilities =
 	    CAP_LARGE_FILES | CAP_NT_SMBS | CAP_LEVEL_II_OPLOCKS |
@@ -1457,8 +1457,8 @@ CIFSNTLMSSPNegotiateSessSetup(unsigned int xid,
 	    NTLMSSP_NEGOTIATE_UNICODE | NTLMSSP_NEGOTIATE_OEM |
 	    NTLMSSP_REQUEST_TARGET | NTLMSSP_NEGOTIATE_NTLM | 0x80000000 |
 	    NTLMSSP_NEGOTIATE_ALWAYS_SIGN | NTLMSSP_NEGOTIATE_128;
-    if(ntlmv2_support)
-        SecurityBlob->NegotiateFlags |= NTLMSSP_NEGOTIATE_NTLMV2;
+	if(ntlmv2_support)
+		SecurityBlob->NegotiateFlags |= NTLMSSP_NEGOTIATE_NTLMV2;
 	/* setup pointers to domain name and workstation name */
 	bcc_ptr += SecurityBlobLength;
 
@@ -1574,8 +1574,8 @@ CIFSNTLMSSPNegotiateSessSetup(unsigned int xid,
 				memcpy(challenge_from_server,
 				       SecurityBlob2->Challenge,
 				       CIFS_CRYPTO_KEY_SIZE);
-                if(SecurityBlob2->NegotiateFlags & NTLMSSP_NEGOTIATE_NTLMV2)
-                    *pNTLMv2_flag = TRUE;
+				if(SecurityBlob2->NegotiateFlags & NTLMSSP_NEGOTIATE_NTLMV2)
+					*pNTLMv2_flag = TRUE;
 				if (smb_buffer->Flags2 &= SMBFLG2_UNICODE) {
 					if ((long) (bcc_ptr) % 2) {
 						remaining_words =
@@ -1661,7 +1661,6 @@ CIFSNTLMSSPNegotiateSessSetup(unsigned int xid,
 						    kcalloc(2, GFP_KERNEL);
 					}
 				} else {	/* ASCII */
-
 					len = strnlen(bcc_ptr, 1024);
 					if (((long) bcc_ptr + len) - (long)
 					    pByteArea(smb_buffer_response)
@@ -1758,8 +1757,8 @@ CIFSNTLMSSPAuthSessSetup(unsigned int xid, struct cifsSesInfo *ses,
 
 	pSMB->req.hdr.Uid = ses->Suid;
 
-    if(ses->secMode & (SECMODE_SIGN_REQUIRED | SECMODE_SIGN_ENABLED))
-        smb_buffer->Flags2 |= SMBFLG2_SECURITY_SIGNATURE;
+	if(ses->secMode & (SECMODE_SIGN_REQUIRED | SECMODE_SIGN_ENABLED))
+		smb_buffer->Flags2 |= SMBFLG2_SECURITY_SIGNATURE;
 
 	pSMB->req.Capabilities =
 	    CAP_LARGE_FILES | CAP_NT_SMBS | CAP_LEVEL_II_OPLOCKS |
@@ -1787,8 +1786,8 @@ CIFSNTLMSSPAuthSessSetup(unsigned int xid, struct cifsSesInfo *ses,
 	    NTLMSSP_NEGOTIATE_UNICODE | NTLMSSP_REQUEST_TARGET |
 	    NTLMSSP_NEGOTIATE_NTLM | NTLMSSP_NEGOTIATE_TARGET_INFO |
 	    0x80000000 | NTLMSSP_NEGOTIATE_ALWAYS_SIGN | NTLMSSP_NEGOTIATE_128;
-    if(ntlmv2_flag)
-        SecurityBlob->NegotiateFlags |= NTLMSSP_NEGOTIATE_NTLMV2;
+	if(ntlmv2_flag)
+		SecurityBlob->NegotiateFlags |= NTLMSSP_NEGOTIATE_NTLMV2;
 
 /* setup pointers to domain name and workstation name */
 
@@ -2048,7 +2047,6 @@ CIFSNTLMSSPAuthSessSetup(unsigned int xid, struct cifsSesInfo *ses,
 						ses->serverNOS = kcalloc(2, GFP_KERNEL);
 					}
 				} else {	/* ASCII */
-
 					len = strnlen(bcc_ptr, 1024);
 					if (((long) bcc_ptr + len) - 
                         (long) pByteArea(smb_buffer_response) 
@@ -2132,8 +2130,8 @@ CIFSTCon(unsigned int xid, struct cifsSesInfo *ses,
 	bcc_ptr = &(pSMB->Password[0]);
 	bcc_ptr++;		/* skip password */
 
-    if(ses->secMode & (SECMODE_SIGN_REQUIRED | SECMODE_SIGN_ENABLED))
-        smb_buffer->Flags2 |= SMBFLG2_SECURITY_SIGNATURE;
+	if(ses->secMode & (SECMODE_SIGN_REQUIRED | SECMODE_SIGN_ENABLED))
+		smb_buffer->Flags2 |= SMBFLG2_SECURITY_SIGNATURE;
 
 	if (ses->capabilities & CAP_STATUS32) {
 		smb_buffer->Flags2 |= SMBFLG2_ERR_STATUS;

fs/cifs/inode.c

@@ -52,9 +52,9 @@ cifs_get_inode_info_unix(struct inode **pinode,
 	if (rc) {
 		if (rc == -EREMOTE) {
 /* rc = *//* CIFSGetDFSRefer(xid, pTcon->ses, search_path,
-   &referrals,
-   &num_referrals,
-   cifs_sb->local_nls); */
+	&referrals,
+	&num_referrals,
+	cifs_sb->local_nls); */
 			tmp_path =
 			    kmalloc(strnlen
 				    (pTcon->treeName,
@@ -99,12 +99,12 @@ cifs_get_inode_info_unix(struct inode **pinode,
 		atomic_inc(&cifsInfo->inUse);	/* inc on every refresh of inode */
 
 		inode->i_atime =
-		    le64_to_cpu(cifs_NTtimeToUnix(findData.LastAccessTime));
+		    cifs_NTtimeToUnix(le64_to_cpu(findData.LastAccessTime));
 		inode->i_mtime =
-		    le64_to_cpu(cifs_NTtimeToUnix
+		    cifs_NTtimeToUnix(le64_to_cpu
 				(findData.LastModificationTime));
 		inode->i_ctime =
-		    le64_to_cpu(cifs_NTtimeToUnix(findData.LastStatusChange));
+		    cifs_NTtimeToUnix(le64_to_cpu(findData.LastStatusChange));
 		inode->i_mode = le64_to_cpu(findData.Permissions);
 		findData.Type = le32_to_cpu(findData.Type);
 		if (findData.Type == UNIX_FILE) {
@@ -140,6 +140,7 @@ cifs_get_inode_info_unix(struct inode **pinode,
 			cFYI(1, (" File inode "));
 			inode->i_op = &cifs_file_inode_ops;
 			inode->i_fop = &cifs_file_ops;
+			inode->i_data.a_ops = &cifs_addr_ops;
 		} else if (S_ISDIR(inode->i_mode)) {
 			cFYI(1, (" Directory inode"));
 			inode->i_op = &cifs_dir_inode_ops;
@@ -182,9 +183,9 @@ cifs_get_inode_info(struct inode **pinode,
 		if (rc == -EREMOTE) {
 			/* BB add call to new func rc = GetDFSReferral(); */
 /* rc = *//* CIFSGetDFSRefer(xid, pTcon->ses, search_path,
-   &referrals,
-   &num_referrals,
-   cifs_sb->local_nls); */
+	&referrals,
+	&num_referrals,
+	cifs_sb->local_nls); */
 			tmp_path =
 			    kmalloc(strnlen
 				    (pTcon->treeName,
@@ -265,6 +266,7 @@ cifs_get_inode_info(struct inode **pinode,
 			cFYI(1, (" File inode "));
 			inode->i_op = &cifs_file_inode_ops;
 			inode->i_fop = &cifs_file_ops;
+			inode->i_data.a_ops = &cifs_addr_ops;
 		} else if (S_ISDIR(inode->i_mode)) {
 			cFYI(1, (" Directory inode "));
 			inode->i_op = &cifs_dir_inode_ops;
@@ -441,9 +443,11 @@ cifs_rename(struct inode *source_inode, struct dentry *source_direntry,
 	cifs_sb_source = CIFS_SB(source_inode->i_sb);
 	pTcon = cifs_sb_source->tcon;
 
-	if (pTcon != cifs_sb_target->tcon)
+	if (pTcon != cifs_sb_target->tcon) {    
 		return -EXDEV;	/* BB actually could be allowed if same server, but
                      different share. Might eventually add support for this */
+        FreeXid(xid);
+    }
 
 	fromName = build_path_from_dentry(source_direntry);
 	toName = build_path_from_dentry(target_direntry);
@@ -455,6 +459,7 @@ cifs_rename(struct inode *source_inode, struct dentry *source_direntry,
 	if (toName)
 		kfree(toName);
 
+    FreeXid(xid);
 	return rc;
 }
 
@@ -479,7 +484,7 @@ cifs_revalidate(struct dentry *direntry)
 	      direntry->d_time, jiffies));
 
 	cifsInode = CIFS_I(direntry->d_inode);
-
+/* BB add check - do not need to revalidate oplocked files */
 	if ((time_before(jiffies, cifsInode->time + HZ))
 	    && (direntry->d_inode->i_nlink == 1)) {
 		cFYI(1, (" Do not need to revalidate "));
@@ -505,12 +510,20 @@ cifs_revalidate(struct dentry *direntry)
 	return rc;
 }
 
+int cifs_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat *stat)
+{
+	int err = cifs_revalidate(dentry);
+	if (!err)
+		generic_fillattr(dentry->d_inode, stat);
+	return err;
+}
+
 void
 cifs_truncate_file(struct inode *inode)
 {				/* BB remove - may not need this function after all BB */
 	int xid;
 	int rc = 0;
-    struct cifsFileInfo *open_file = NULL;
+	struct cifsFileInfo *open_file = NULL;
 	struct cifs_sb_info *cifs_sb;
 	struct cifsTconInfo *pTcon;
 	struct cifsInodeInfo *cifsInode;
@@ -534,21 +547,19 @@ cifs_truncate_file(struct inode *inode)
 		full_path = build_path_from_dentry(dirent);
 		rc = CIFSSMBSetEOF(xid, pTcon, full_path, inode->i_size,FALSE,
 				   cifs_sb->local_nls);
-        cFYI(1,("\nSetEOF (truncate) rc = %d",rc));
-        if(rc == -ETXTBSY) {        
-            cifsInode = CIFS_I(inode);
-            if(!list_empty(&(cifsInode->openFileList))) {            
-	            open_file = list_entry(cifsInode->openFileList.next,
-                                       struct cifsFileInfo, flist);           
-                /* We could check if file is open for writing first and 
-                   also we could also override the smb pid with the pid 
-                   of the file opener when sending the CIFS request */
-                rc = CIFSSMBSetFileSize(xid, pTcon, inode->i_size,
-                                        open_file->netfid,open_file->pid,FALSE);
-            } else {
-                cFYI(1,("\nNo open files to get file handle from"));
-            }
-        }
+		cFYI(1,("\nSetEOF (truncate) rc = %d",rc));
+		if(rc == -ETXTBSY) {        
+			cifsInode = CIFS_I(inode);
+			if(!list_empty(&(cifsInode->openFileList))) {            
+				open_file = list_entry(cifsInode->openFileList.next,
+					struct cifsFileInfo, flist);           
+            /* We could check if file is open for writing first */
+				 rc = CIFSSMBSetFileSize(xid, pTcon, inode->i_size,
+					open_file->netfid,open_file->pid,FALSE);
+			} else {
+				  cFYI(1,("\nNo open files to get file handle from"));
+			}
+		}
 		if (!rc)
 			CIFSSMBSetEOF(xid,pTcon,full_path,inode->i_size,TRUE,cifs_sb->local_nls);
            /* allocation size setting seems optional so ignore return code */
@@ -567,7 +578,7 @@ cifs_setattr(struct dentry *direntry, struct iattr *attrs)
 	struct cifsTconInfo *pTcon;
 	char *full_path = NULL;
 	int rc = -EACCES;
-    struct cifsFileInfo *open_file = NULL;
+	struct cifsFileInfo *open_file = NULL;
 	FILE_BASIC_INFO time_buf;
 	int set_time = FALSE;
 	__u64 mode = 0xFFFFFFFFFFFFFFFF;
@@ -593,19 +604,19 @@ cifs_setattr(struct dentry *direntry, struct iattr *attrs)
 	if (attrs->ia_valid & ATTR_SIZE) {
 		rc = CIFSSMBSetEOF(xid, pTcon, full_path, attrs->ia_size,FALSE,
 				   cifs_sb->local_nls);
-        cFYI(1,("\nSetEOF (setattrs) rc = %d",rc));
+		cFYI(1,("\nSetEOF (setattrs) rc = %d",rc));
 
-        if(rc == -ETXTBSY) {
-            if(!list_empty(&(cifsInode->openFileList))) {            
-                open_file = list_entry(cifsInode->openFileList.next, 
-                               struct cifsFileInfo, flist);           
+		if(rc == -ETXTBSY) {
+			if(!list_empty(&(cifsInode->openFileList))) {            
+				open_file = list_entry(cifsInode->openFileList.next, 
+					   struct cifsFileInfo, flist);           
     /* We could check if file is open for writing first */
-                rc = CIFSSMBSetFileSize(xid, pTcon, attrs->ia_size,
-                                        open_file->netfid,open_file->pid,FALSE);           
-            } else {
-                cFYI(1,("\nNo open files to get file handle from"));
-            }
-        }
+				rc = CIFSSMBSetFileSize(xid, pTcon, attrs->ia_size,
+					   open_file->netfid,open_file->pid,FALSE);           
+			} else {
+				cFYI(1,("\nNo open files to get file handle from"));
+			}
+		}
         /*  Set Allocation Size of file - might not even need to call the
             following but might as well and it does not hurt if it fails */
 		CIFSSMBSetEOF(xid, pTcon, full_path, attrs->ia_size, TRUE, cifs_sb->local_nls);
@@ -684,5 +695,4 @@ cifs_delete_inode(struct inode *inode)
 	cFYI(1, ("In cifs_delete_inode, inode = 0x%p\n", inode));
 	/* may have to add back in when safe distributed caching of
              directories via e.g. FindNotify added */
-
 }

fs/cifs/md5.h

@@ -22,17 +22,17 @@ struct HMACMD5Context {
 
 void MD5Init(struct MD5Context *context);
 void MD5Update(struct MD5Context *context, unsigned char const *buf,
-	       unsigned len);
+			unsigned len);
 void MD5Final(unsigned char digest[16], struct MD5Context *context);
 
 /* The following definitions come from lib/hmacmd5.c  */
 
 void hmac_md5_init_rfc2104(unsigned char *key, int key_len,
-			   struct HMACMD5Context *ctx);
+			struct HMACMD5Context *ctx);
 void hmac_md5_init_limK_to_64(const unsigned char *key, int key_len,
-			      struct HMACMD5Context *ctx);
+			struct HMACMD5Context *ctx);
 void hmac_md5_update(const unsigned char *text, int text_len,
-		     struct HMACMD5Context *ctx);
+			struct HMACMD5Context *ctx);
 void hmac_md5_final(unsigned char *digest, struct HMACMD5Context *ctx);
 void hmac_md5(unsigned char key[16], unsigned char *data, int data_len,
-	      unsigned char *digest);
+			unsigned char *digest);

fs/cifs/misc.c

@@ -304,42 +304,42 @@ checkSMB(struct smb_hdr *smb, __u16 mid, int length)
 int
 is_valid_oplock_break(struct smb_hdr *buf)
 {    
-	struct smb_com_lock_req * pSMB = (struct smb_com_lock_req *)buf;
-	struct list_head *tmp;
-	struct cifsTconInfo *tcon;
-
-	/* could add check for smb response flag 0x80 */
-	cFYI(1,("\nChecking for oplock break"));    
-	if(pSMB->hdr.Command != SMB_COM_LOCKING_ANDX)
-		return FALSE;
-	if(pSMB->hdr.Flags & SMBFLG_RESPONSE)
-		return FALSE; /* server sends us "request" here */
-	if(pSMB->hdr.WordCount != 8)
-		return FALSE;
-
-	cFYI(1,(" oplock type 0x%d level 0x%d",pSMB->LockType,pSMB->OplockLevel));
-	if(!(pSMB->LockType & LOCKING_ANDX_OPLOCK_RELEASE))
-		return FALSE;    
-
-	/* look up tcon based on tid & uid */
-	read_lock(&GlobalSMBSeslock);
-	list_for_each(tmp, &GlobalTreeConnectionList) {
-		tcon = list_entry(tmp, struct cifsTconInfo, cifsConnectionList);
-		if (tcon->tid == buf->Tid)
-			if(tcon->ses->Suid == buf->Uid) {
-			/* BB Add following logic: 
-			  2) look up inode from tcon->openFileList->file->f_dentry->d_inode
-			  3) flush dirty pages and cached byte range locks and mark inode
-			  4) depending on break type change to r/o caching or no caching
-			  5) send oplock break response to server */
-				read_unlock(&GlobalSMBSeslock);
-				cFYI(1,("\nFound matching connection, process oplock break"));
-				return TRUE;
-			}
-	}
-	read_unlock(&GlobalSMBSeslock);
-	cFYI(1,("\nProcessing oplock break for non-existent connection"));
-	return TRUE;
+       struct smb_com_lock_req * pSMB = (struct smb_com_lock_req *)buf;
+       struct list_head *tmp;
+       struct cifsTconInfo *tcon;
+
+       /* could add check for smb response flag 0x80 */
+       cFYI(1,("\nChecking for oplock break"));    
+       if(pSMB->hdr.Command != SMB_COM_LOCKING_ANDX)
+               return FALSE;
+       if(pSMB->hdr.Flags & SMBFLG_RESPONSE)
+               return FALSE; /* server sends us "request" here */
+       if(pSMB->hdr.WordCount != 8)
+               return FALSE;
+
+       cFYI(1,(" oplock type 0x%d level 0x%d",pSMB->LockType,pSMB->OplockLevel));
+       if(!(pSMB->LockType & LOCKING_ANDX_OPLOCK_RELEASE))
+               return FALSE;    
+
+       /* look up tcon based on tid & uid */
+       read_lock(&GlobalSMBSeslock);
+       list_for_each(tmp, &GlobalTreeConnectionList) {
+               tcon = list_entry(tmp, struct cifsTconInfo, cifsConnectionList);
+               if (tcon->tid == buf->Tid)
+                       if(tcon->ses->Suid == buf->Uid) {
+                       /* BB Add following logic: 
+                         2) look up inode from tcon->openFileList->file->f_dentry->d_inode
+                         3) flush dirty pages and cached byte range locks and mark inode
+                         4) depending on break type change to r/o caching or no caching
+                         5) send oplock break response to server */
+                               read_unlock(&GlobalSMBSeslock);
+                               cFYI(1,("\nFound matching connection, process oplock break"));
+                               return TRUE;
+                       }
+       }
+       read_unlock(&GlobalSMBSeslock);
+       cFYI(1,("\nProcessing oplock break for non-existent connection"));
+       return TRUE;
 }
 
 void

fs/cifs/netmisc.c

@@ -745,7 +745,28 @@ const static struct {
 	ERRDOS, ERRnoaccess, 0xc0000290}, {
 ERRDOS, ERRbadfunc, 0xc000029c},};
 
-void
+/*****************************************************************************
+ Print an error message from the status code
+ *****************************************************************************/
+static void
+cifs_print_status(__u32 status_code)
+{
+	int idx = 0;
+
+	printk("\nStatus code returned: 0x%08x", status_code);
+
+	while (nt_errs[idx].nt_errstr != NULL) {
+		if (((nt_errs[idx].nt_errcode) & 0xFFFFFF) ==
+		    (status_code & 0xFFFFFF)) {
+			printk(nt_errs[idx].nt_errstr);
+		}
+		idx++;
+	}
+	return;
+}
+
+
+static void
 ntstatus_to_dos(__u32 ntstatus, __u8 * eclass, __u16 * ecode)
 {
 	int i;
@@ -781,9 +802,9 @@ map_smb_to_linux_error(struct smb_hdr *smb)
 
 	if (smb->Flags2 & SMBFLG2_ERR_STATUS) {
 		/* translate the newer STATUS codes to old style errors and then to POSIX errors */
-		cFYI(1,
-		     (" !!Mapping cifs error code %d ", smb->Status.CifsError));
 		smb->Status.CifsError = le32_to_cpu(smb->Status.CifsError);
+		if(cifsFYI)
+			cifs_print_status(smb->Status.CifsError);
 		ntstatus_to_dos(smb->Status.CifsError, &smberrclass,
 				&smberrcode);
 	} else {

fs/cifs/nterr.c

@@ -20,14 +20,9 @@
  */
 
 /* NT error codes - see nterr.h */
-#include "nterr.h"
 #include <linux/types.h>
 #include <linux/fs.h>
-
-struct nt_err_code_struct {
-	char *nt_errstr;
-	__u32 nt_errcode;
-};
+#include "nterr.h"
 
 const struct nt_err_code_struct nt_errs[] = {
 	{"NT_STATUS_OK", NT_STATUS_OK},
@@ -690,23 +685,3 @@ const struct nt_err_code_struct nt_errs[] = {
 	{"STATUS_SOME_UNMAPPED", STATUS_SOME_UNMAPPED},
 	{NULL, 0}
 };
-
-/*****************************************************************************
- Print an error message from the status code
- *****************************************************************************/
-/* void
-cifs_print_status(__u32 status_code)
-{
-	int idx = 0;
-
-	printk("\nStatus code returned: 0x%08x", status_code);
-
-	while (nt_errs[idx].nt_errstr != NULL) {
-		if (((nt_errs[idx].nt_errcode) & 0xFFFFFF) ==
-		    (status_code & 0xFFFFFF)) {
-			printk(nt_errs[idx].nt_errstr);
-		}
-		idx++;
-	}
-	return;
-} */

fs/cifs/nterr.h

@@ -22,9 +22,18 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
+
+
 #ifndef _NTERR_H
 #define _NTERR_H
 
+struct nt_err_code_struct {
+	char *nt_errstr;
+	__u32 nt_errcode;
+};
+
+extern const struct nt_err_code_struct nt_errs[];
+
 /* Win32 Status codes. */
 
 #define STATUS_BUFFER_OVERFLOW            0x80000005

fs/cifs/smbencrypt.c

@@ -205,19 +205,26 @@ nt_lm_owf_gen(char *pwd, unsigned char nt_p16[16], unsigned char p16[16])
 /* Does the NTLMv2 owfs of a user's password */
 void
 ntv2_owf_gen(const unsigned char owf[16], const char *user_n,
-	     const char *domain_n, unsigned char kr_buf[16],
-	     const struct nls_table *nls_codepage)
+		const char *domain_n, unsigned char kr_buf[16],
+		const struct nls_table *nls_codepage)
 {
-	wchar_t user_u[1024];
-	wchar_t dom_u[1024];
+	wchar_t * user_u;
+	wchar_t * dom_u;
+	int user_l, domain_l;
 	struct HMACMD5Context ctx;
 
+	/* might as well do one alloc to hold both (user_u and dom_u) */
+	user_u = kmalloc(2048 * sizeof(wchar_t),GFP_KERNEL); 
+	if(user_u == NULL)
+		return;
+	dom_u = user_u + 1024;
+    
 	/* push_ucs2(NULL, user_u, user_n, (user_l+1)*2, STR_UNICODE|STR_NOALIGN|STR_TERMINATE|STR_UPPER);
 	   push_ucs2(NULL, dom_u, domain_n, (domain_l+1)*2, STR_UNICODE|STR_NOALIGN|STR_TERMINATE|STR_UPPER); */
 
-    /* do not think it is supposed to be uppercased */
-	int user_l = cifs_strtoUCS(user_u, user_n, 511, nls_codepage);
-	int domain_l = cifs_strtoUCS(dom_u, domain_n, 511, nls_codepage);
+	/* do not think it is supposed to be uppercased */
+	user_l = cifs_strtoUCS(user_u, user_n, 511, nls_codepage);
+	domain_l = cifs_strtoUCS(dom_u, domain_n, 511, nls_codepage);
 
 	user_l++;		/* trailing null */
 	domain_l++;
@@ -234,6 +241,7 @@ ntv2_owf_gen(const unsigned char owf[16], const char *user_n,
 	dump_data(100, owf, 16);
 	dump_data(100, kr_buf, 16);
 #endif
+	kfree(user_u);
 }
 
 /* Does the des encryption from the NT or LM MD4 hash. */

fs/cifs/transport.c

@@ -59,11 +59,11 @@ AllocMidQEntry(struct smb_hdr *smb_buffer, struct cifsSesInfo *ses)
 		temp->tsk = current;
 	}
 	if (ses->status == CifsGood) {
-        write_lock(&GlobalMid_Lock);
+		write_lock(&GlobalMid_Lock);
 		list_add_tail(&temp->qhead, &ses->server->pending_mid_q);
 		atomic_inc(&midCount);
 		temp->midState = MID_REQUEST_ALLOCATED;
-        write_unlock(&GlobalMid_Lock);
+		write_unlock(&GlobalMid_Lock);
 	} else {		/* BB add reconnect code here BB */
 
 		cERROR(1,
@@ -97,8 +97,8 @@ smb_send(struct socket *ssocket, struct smb_hdr *smb_buffer,
 	struct iovec iov;
 	mm_segment_t temp_fs;
 
-    if(ssocket == NULL)
-        return -ENOTSOCK; /* BB eventually add reconnect code here */
+	if(ssocket == NULL)
+		return -ENOTSOCK; /* BB eventually add reconnect code here */
 /*  ssocket->sk->allocation = GFP_BUFFER; *//* BB is this spurious? */
 	iov.iov_base = smb_buffer;
 	iov.iov_len = smb_buf_length + 4;
@@ -163,8 +163,6 @@ SendReceive(const unsigned int xid, struct cifsSesInfo *ses,
 	rc = smb_send(ses->server->ssocket, in_buf, in_buf->smb_buf_length,
 		      (struct sockaddr *) &(ses->server->sockAddr));
 
-	cFYI(1, ("\ncifs smb_send rc %d", rc));	/* BB remove */
-	/* BB add code to wait for response and copy to out_buf */
 	if (long_op > 1)	/* writes past end of file can take a looooooong time */
 		timeout = 300 * HZ;
 	else if (long_op == 1)
@@ -178,10 +176,9 @@ SendReceive(const unsigned int xid, struct cifsSesInfo *ses,
 	/* Replace above line with wait_event to get rid of sleep_on per lk guidelines */
 
 	timeout = wait_event_interruptible_timeout(ses->server->response_q,
-						   midQ->
-						   midState &
-						   MID_RESPONSE_RECEIVED,
-						   15 * HZ);
+				midQ->
+				midState & MID_RESPONSE_RECEIVED,
+				timeout);
 	cFYI(1,
 	     (" with timeout %ld and Out_buf: %p  midQ->resp_buf: %p ", timeout,
 	      out_buf, midQ->resp_buf));
@@ -244,6 +241,8 @@ SendReceive(const unsigned int xid, struct cifsSesInfo *ses,
 			rc = -EIO;
 	}
 
-	DeleteMidQEntry(midQ);	/* BB what if process is killed ? - BB add background daemon to clean up Mid entries from killed processes BB test killing process with active mid */
+	DeleteMidQEntry(midQ);	/* BB what if process is killed?
+			 - BB add background daemon to clean up Mid entries from
+			 killed processes & test killing process with active mid */
 	return rc;
 }