diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-08-06 13:54:36 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-08-06 13:54:36 -0700 |
| commit | 1957e7fdefce4494cb8d8f09ee2317b7ede24994 (patch) | |
| tree | 3a7dc640b6720c857186e59a4a820eae92acbb01 /fs/cifs/sess.c | |
| parent | ce195d328485459b77672ef20485a8e4f21477b5 (diff) | |
| parent | 80975d21aae2136ccae1ce914a1602dc1d8b0795 (diff) | |
| download | op-kernel-dev-1957e7fdefce4494cb8d8f09ee2317b7ede24994.zip op-kernel-dev-1957e7fdefce4494cb8d8f09ee2317b7ede24994.tar.gz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6:
cifs: cope with negative dentries in cifs_get_root
cifs: convert prefixpath delimiters in cifs_build_path_to_root
CIFS: Fix missing a decrement of inFlight value
cifs: demote DFS referral lookup errors to cFYI
Revert "cifs: advertise the right receive buffer size to the server"
Diffstat (limited to 'fs/cifs/sess.c')
| -rw-r--r-- | fs/cifs/sess.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/cifs/sess.c b/fs/cifs/sess.c index 243d587..d3e6196 100644 --- a/fs/cifs/sess.c +++ b/fs/cifs/sess.c @@ -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); |
