Browse Source

[CIFS] Make use of newer QFSInfo dependent on capability bit instead of
whether we negotiated legacy lanman dialect so we do not keep retrying
for mount to WindowsME

Signed-off-by: Steve French <sfrench@us.ibm.com>

Steve French 18 years ago
parent
commit
de7ed55dbb
2 changed files with 2 additions and 2 deletions
  1. 1 1
      fs/cifs/cifsfs.c
  2. 1 1
      fs/cifs/cifsglob.h

+ 1 - 1
fs/cifs/cifsfs.c

@@ -199,7 +199,7 @@ cifs_statfs(struct dentry *dentry, struct kstatfs *buf)
     /* Only need to call the old QFSInfo if failed
     /* Only need to call the old QFSInfo if failed
     on newer one */
     on newer one */
     if(rc)
     if(rc)
-	if((pTcon->ses->flags & CIFS_SES_LANMAN) == 0)
+	if(pTcon->ses->capabilities & CAP_NT_SMBS)
 		rc = CIFSSMBQFSInfo(xid, pTcon, buf); /* not supported by OS2 */
 		rc = CIFSSMBQFSInfo(xid, pTcon, buf); /* not supported by OS2 */
 
 
 	/* Some old Windows servers also do not support level 103, retry with
 	/* Some old Windows servers also do not support level 103, retry with

+ 1 - 1
fs/cifs/cifsglob.h

@@ -153,7 +153,7 @@ struct TCP_Server_Info {
 	char sessid[4];		/* unique token id for this session */
 	char sessid[4];		/* unique token id for this session */
 	/* (returned on Negotiate */
 	/* (returned on Negotiate */
 	int capabilities; /* allow selective disabling of caps by smb sess */
 	int capabilities; /* allow selective disabling of caps by smb sess */
-	__u16 timeAdj;  /* Adjust for difference in server time zone in sec */
+	int timeAdj;  /* Adjust for difference in server time zone in sec */
 	__u16 CurrentMid;         /* multiplex id - rotating counter */
 	__u16 CurrentMid;         /* multiplex id - rotating counter */
 	char cryptKey[CIFS_CRYPTO_KEY_SIZE];
 	char cryptKey[CIFS_CRYPTO_KEY_SIZE];
 	/* 16th byte of RFC1001 workstation name is always null */
 	/* 16th byte of RFC1001 workstation name is always null */