From: Jeff Layton Date: Mon, 6 Aug 2012 11:10:49 +0000 (-0400) Subject: cifs: remove the kmap size limit from wsize X-Git-Tag: next-20120917~106^2~22 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=bf74cc646d412a2dc6a23c76680d0d668d970989;p=karo-tx-linux.git 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 Signed-off-by: Jeff Layton Signed-off-by: Steve French --- diff --git a/fs/cifs/smb1ops.c b/fs/cifs/smb1ops.c index f6c7a1c9a1b6..8727ef712a3c 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 3a8c68258026..a621d6125367 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; }