From b30937b18327b41d42da9debb04c5c157ff2ecf2 Mon Sep 17 00:00:00 2001
From: Jeff Layton <jlayton@redhat.com>
Date: Tue, 18 Sep 2012 16:20:36 -0700
Subject: [PATCH] --- yaml --- r: 326295 b: refs/heads/master c:
 c84ce4a7b22aa54017c61217f8a0e5e24d593da1 h: refs/heads/master i:   326293:
 00124247d95e8518d4195bf773694437c9e0bd2c   326291:
 c0f25db5e14be0fcbcd56a4703a39e8feb48b506   326287:
 52baaf58bba0d43ba25885de2bec55b4b71f1c09 v: v3

---
 [refs]                  | 2 +-
 trunk/fs/cifs/smb1ops.c | 3 ---
 trunk/fs/cifs/smb2ops.c | 3 ---
 3 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 64aa5ada84e0..710d8857c9dd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: eddb079deb4deb1259f87425094c7a586fc59313
+refs/heads/master: c84ce4a7b22aa54017c61217f8a0e5e24d593da1
diff --git a/trunk/fs/cifs/smb1ops.c b/trunk/fs/cifs/smb1ops.c
index f6c7a1c9a1b6..8727ef712a3c 100644
--- a/trunk/fs/cifs/smb1ops.c
+++ b/trunk/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/trunk/fs/cifs/smb2ops.c b/trunk/fs/cifs/smb2ops.c
index 3a8c68258026..a621d6125367 100644
--- a/trunk/fs/cifs/smb2ops.c
+++ b/trunk/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;
 }