diff options
| author | Pavel Shilovsky <pshilovsky@samba.org> | 2014-06-25 11:28:57 +0400 |
|---|---|---|
| committer | Steve French <smfrench@gmail.com> | 2014-08-02 10:23:03 +0400 |
| commit | bed9da0213f2174719b68012bd60735a11cfe244 (patch) | |
| tree | 3a88a92dcf884d1a31a8896e9513a5124cbddebb /fs/cifs/smb2ops.c | |
| parent | e374d90f8a7693f24635bca9e5d56f3775bb36e2 (diff) | |
| download | linux-bed9da0213f2174719b68012bd60735a11cfe244.tar.xz | |
CIFS: Use multicredits for SMB 2.1/3 reads
If we negotiate SMB 2.1 and higher version of the protocol and
a server supports large read buffer size, we need to consume 1
credit per 65536 bytes. So, we need to know how many credits
we have and obtain the required number of them before constructing
a readdata structure in readpages and user read.
Reviewed-by: Shirish Pargaonkar <spargaonkar@suse.com>
Signed-off-by: Pavel Shilovsky <pshilovsky@samba.org>
Signed-off-by: Steve French <smfrench@gmail.com>
Diffstat (limited to 'fs/cifs/smb2ops.c')
| -rw-r--r-- | fs/cifs/smb2ops.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/fs/cifs/smb2ops.c b/fs/cifs/smb2ops.c index 3427c1fa3806..d0210a8e9829 100644 --- a/fs/cifs/smb2ops.c +++ b/fs/cifs/smb2ops.c @@ -245,8 +245,9 @@ smb2_negotiate_rsize(struct cifs_tcon *tcon, struct smb_vol *volume_info) /* start with specified rsize, or default */ rsize = volume_info->rsize ? volume_info->rsize : CIFS_DEFAULT_IOSIZE; rsize = min_t(unsigned int, rsize, server->max_read); - /* set it to the maximum buffer size value we can send with 1 credit */ - rsize = min_t(unsigned int, rsize, SMB2_MAX_BUFFER_SIZE); + + if (!(server->capabilities & SMB2_GLOBAL_CAP_LARGE_MTU)) + rsize = min_t(unsigned int, rsize, SMB2_MAX_BUFFER_SIZE); return rsize; } |