]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
cifs: remove the kmap size limit from wsize
authorJeff Layton <jlayton@redhat.com>
Mon, 6 Aug 2012 11:10:49 +0000 (07:10 -0400)
committerSteve French <sfrench@us.ibm.com>
Fri, 14 Sep 2012 14:44:10 +0000 (09:44 -0500)
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>
fs/cifs/smb1ops.c
fs/cifs/smb2ops.c

index f6c7a1c9a1b66bde0db601d2fc05deb59d66d76f..8727ef712a3cff087ec618273e4cbe7cfc57f5bd 100644 (file)
@@ -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);
 
index 3a8c682580269ac2adbf34e90ccdecb87c07415c..a621d61253678e0ed1f04ca21c65fd71ab6ae208 100644 (file)
@@ -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;
 }