diff options
| author | Jeff Layton <jlayton@redhat.com> | 2011-10-11 12:41:32 +0200 |
|---|---|---|
| committer | Steve French <smfrench@gmail.com> | 2011-10-13 06:41:32 +0200 |
| commit | c974befa402b5eb2ed115b3083b5a46a4be85a9f (patch) | |
| tree | 88c5835981e1e306248b9f9c4662510ff5b8d5e1 /fs/cifs/sess.c | |
| parent | cifs: Fix typo 'CIFS_NFSD_EXPORT' (diff) | |
| download | linux-c974befa402b5eb2ed115b3083b5a46a4be85a9f.tar.xz linux-c974befa402b5eb2ed115b3083b5a46a4be85a9f.zip | |
cifs: untangle server->maxBuf and CIFSMaxBufSize
server->maxBuf is the maximum SMB size (including header) that the
server can handle. CIFSMaxBufSize is the maximum amount of data (sans
header) that the client can handle. Currently maxBuf is being capped at
CIFSMaxBufSize + the max headers size, and the two values are used
somewhat interchangeably in the code.
This makes little sense as these two values are not related at all.
Separate them and make sure the code uses the right values in the right
places.
Signed-off-by: Jeff Layton <jlayton@redhat.com>
Signed-off-by: Steve French <smfrench@gmail.com>
Diffstat (limited to 'fs/cifs/sess.c')
| -rw-r--r-- | fs/cifs/sess.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/fs/cifs/sess.c b/fs/cifs/sess.c index d3e619692ee0..c7d80e24f24e 100644 --- a/fs/cifs/sess.c +++ b/fs/cifs/sess.c @@ -124,7 +124,9 @@ 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(ses->server->maxBuf); + pSMB->req.MaxBufferSize = cpu_to_le16(min_t(u32, + CIFSMaxBufSize + MAX_CIFS_HDR_SIZE - 4, + USHRT_MAX)); pSMB->req.MaxMpxCount = cpu_to_le16(ses->server->maxReq); pSMB->req.VcNumber = get_next_vcnum(ses); |