Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit de7ed55d authored by Steve French's avatar Steve French
Browse files

[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: default avatarSteve French <sfrench@us.ibm.com>
parent 9ac00b7d

fs/cifs/cifsfs.c

+1 −1
Original line number Diff line number Diff line
@@ -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

fs/cifs/cifsglob.h

+1 −1
Original line number Diff line number Diff line
@@ -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 */