diff options
| author |   Steve French <sfrench@us.ibm.com> | 2006-09-30 13:25:52 +0000 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2006-09-30 13:25:52 +0000 |
| commit | de7ed55dbb2f2c44be669d56c4adf28cbffb26ce (patch) | |
| tree | 07dcca53b776d7bcfa25d4c7c6c614618f186b3d /fs/cifs | |
| parent | [CIFS] Do not send newer QFSInfo to legacy servers which can not support it (diff) | |
| download | linux-dev-de7ed55dbb2f2c44be669d56c4adf28cbffb26ce.tar.xz linux-dev-de7ed55dbb2f2c44be669d56c4adf28cbffb26ce.zip | |
[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>
Diffstat (limited to 'fs/cifs')
| -rw-r--r-- | fs/cifs/cifsfs.c | 2 | ||||
| -rw-r--r-- | fs/cifs/cifsglob.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c index d6d226addde2..43364361276e 100644 --- a/fs/cifs/cifsfs.c +++ b/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 on newer one */ 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 */ /* Some old Windows servers also do not support level 103, retry with diff --git a/fs/cifs/cifsglob.h b/fs/cifs/cifsglob.h index 597afdf4c69c..74d3ccbb103b 100644 --- a/fs/cifs/cifsglob.h +++ b/fs/cifs/cifsglob.h @@ -153,7 +153,7 @@ struct TCP_Server_Info { char sessid[4]; /* unique token id for this session */ /* (returned on Negotiate */ 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 */ char cryptKey[CIFS_CRYPTO_KEY_SIZE]; /* 16th byte of RFC1001 workstation name is always null */ |