Revert "cifs: advertise the right receive buffer size to the server"
authorSteve French <sfrench@us.ibm.com>
Wed, 3 Aug 2011 03:17:43 +0000 (03:17 +0000)
committerSteve French <sfrench@us.ibm.com>
Wed, 3 Aug 2011 03:17:43 +0000 (03:17 +0000)
This reverts commit c4d3396b261473ded6f370edd1e79ba34e089d7e.

Problems discovered with readdir to Samba due to
not accounting for header size properly with this change

fs/cifs/sess.c

index 243d587..d3e6196 100644 (file)
@@ -124,8 +124,7 @@ static __u32 cifs_ssetup_hdr(struct cifs_ses *ses, SESSION_SETUP_ANDX *pSMB)
        /*      that we use in next few lines                               */
        /* Note that header is initialized to zero in header_assemble */
        pSMB->req.AndXCommand = 0xFF;
-       pSMB->req.MaxBufferSize = cpu_to_le16(min_t(u32, CIFSMaxBufSize - 4,
-                                               USHRT_MAX));
+       pSMB->req.MaxBufferSize = cpu_to_le16(ses->server->maxBuf);
        pSMB->req.MaxMpxCount = cpu_to_le16(ses->server->maxReq);
        pSMB->req.VcNumber = get_next_vcnum(ses);