aboutsummaryrefslogtreecommitdiffstats
path: root/fs/cifs
diff options
context:
space:
mode:
authorJeff Layton <jlayton@redhat.com>2012-09-18 19:20:36 -0400
committerSteve French <smfrench@gmail.com>2012-09-24 22:46:31 -0400
commitc84ce4a7b22aa54017c61217f8a0e5e24d593da1 (patch)
tree05af4457d10b84c14a2e63cf656cc1398d4e1a3c /fs/cifs
parenteddb079deb4deb1259f87425094c7a586fc59313 (diff)
cifs: remove the kmap size limit from wsize
Now that we're not kmapping so much at once, there's no need to cap the wsize at the amount that can be simultaneously kmapped. Reviewed-by: Pavel Shilovsky <pshilovsky@samba.org> Signed-off-by: Jeff Layton <jlayton@redhat.com> Signed-off-by: Steve French <smfrench@gmail.com>
Diffstat (limited to 'fs/cifs')
-rw-r--r--fs/cifs/smb1ops.c3
-rw-r--r--fs/cifs/smb2ops.c3
2 files changed, 0 insertions, 6 deletions
diff --git a/fs/cifs/smb1ops.c b/fs/cifs/smb1ops.c
index f6c7a1c9a1b..8727ef712a3 100644
--- a/fs/cifs/smb1ops.c
+++ b/fs/cifs/smb1ops.c
@@ -442,9 +442,6 @@ cifs_negotiate_wsize(struct cifs_tcon *tcon, struct smb_vol *volume_info)
442 wsize = min_t(unsigned int, wsize, 442 wsize = min_t(unsigned int, wsize,
443 server->maxBuf - sizeof(WRITE_REQ) + 4); 443 server->maxBuf - sizeof(WRITE_REQ) + 4);
444 444
445 /* limit to the amount that we can kmap at once */
446 wsize = min_t(unsigned int, wsize, CIFS_KMAP_SIZE_LIMIT);
447
448 /* hard limit of CIFS_MAX_WSIZE */ 445 /* hard limit of CIFS_MAX_WSIZE */
449 wsize = min_t(unsigned int, wsize, CIFS_MAX_WSIZE); 446 wsize = min_t(unsigned int, wsize, CIFS_MAX_WSIZE);
450 447
diff --git a/fs/cifs/smb2ops.c b/fs/cifs/smb2ops.c
index 3a8c6825802..a621d612536 100644
--- a/fs/cifs/smb2ops.c
+++ b/fs/cifs/smb2ops.c
@@ -187,9 +187,6 @@ smb2_negotiate_wsize(struct cifs_tcon *tcon, struct smb_vol *volume_info)
187 */ 187 */
188 wsize = min_t(unsigned int, wsize, 2 << 15); 188 wsize = min_t(unsigned int, wsize, 2 << 15);
189 189
190 /* limit to the amount that we can kmap at once */
191 wsize = min_t(unsigned int, wsize, CIFS_KMAP_SIZE_LIMIT);
192
193 return wsize; 190 return wsize;
194} 191}
195 192