summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeff Layton <jlayton@redhat.com>2012-09-18 16:20:36 -0700
committerSteve French <smfrench@gmail.com>2012-09-24 21:46:31 -0500
commitc84ce4a7b22aa54017c61217f8a0e5e24d593da1 (patch)
tree05af4457d10b84c14a2e63cf656cc1398d4e1a3c
parenteddb079deb4deb1259f87425094c7a586fc59313 (diff)
downloadop-kernel-dev-c84ce4a7b22aa54017c61217f8a0e5e24d593da1.zip
op-kernel-dev-c84ce4a7b22aa54017c61217f8a0e5e24d593da1.tar.gz
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>
-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 f6c7a1c..8727ef7 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)
wsize = min_t(unsigned int, wsize,
server->maxBuf - sizeof(WRITE_REQ) + 4);
- /* limit to the amount that we can kmap at once */
- wsize = min_t(unsigned int, wsize, CIFS_KMAP_SIZE_LIMIT);
-
/* hard limit of CIFS_MAX_WSIZE */
wsize = min_t(unsigned int, wsize, CIFS_MAX_WSIZE);
diff --git a/fs/cifs/smb2ops.c b/fs/cifs/smb2ops.c
index 3a8c682..a621d61 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)
*/
wsize = min_t(unsigned int, wsize, 2 << 15);
- /* limit to the amount that we can kmap at once */
- wsize = min_t(unsigned int, wsize, CIFS_KMAP_SIZE_LIMIT);
-
return wsize;
}
OpenPOWER on IntegriCloud