From patchwork Wed Jul 18 17:59:05 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Layton X-Patchwork-Id: 1212811 Return-Path: X-Original-To: patchwork-cifs-client@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 2FBA33FD4F for ; Wed, 18 Jul 2012 17:59:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755311Ab2GRR7Y (ORCPT ); Wed, 18 Jul 2012 13:59:24 -0400 Received: from mail-yx0-f174.google.com ([209.85.213.174]:38268 "EHLO mail-yx0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755273Ab2GRR7Y (ORCPT ); Wed, 18 Jul 2012 13:59:24 -0400 Received: by mail-yx0-f174.google.com with SMTP id l2so1865378yen.19 for ; Wed, 18 Jul 2012 10:59:24 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references:x-gm-message-state; bh=6PXn/d0XTM/xvpi7RTDSF0Ktn28zcDNsmkzuMwPmSkM=; b=O0xLakMv4ET2/e5AmyUEK4qLPtbHWAPcHkesKlM3Qgg4sZngEpywtWT4Mr5nkcj7YK ZlIOwKwyRdn4PcXrxm0qnCGJXcFZ6s77aatsB16NMUtaZNIB5FTobGeJUuZR6hKKNVqu bs2pRubpGjiR70j+WcLDWCMg4qENl6Cb0t7D5dYWNRJn/lbybE9JduGh8rrANOYZp5/N DnFPVqCQFht8cNLTGgjlvJixbhmImCz+V12WAB0pxlSc5xKQHj4xyREBW0kWaXkRqbu5 jRoXny7g2JB4ARO1Cr/wt4lighX++FpRzWdD300gtcM/w5ji+4AEmRP5IsqQWV75GqA7 pT1A== Received: by 10.236.73.6 with SMTP id u6mr1780052yhd.31.1342634364197; Wed, 18 Jul 2012 10:59:24 -0700 (PDT) Received: from salusa.poochiereds.net (cpe-076-182-054-194.nc.res.rr.com. [76.182.54.194]) by mx.google.com with ESMTPS id e5sm20270107ani.18.2012.07.18.10.59.23 (version=SSLv3 cipher=OTHER); Wed, 18 Jul 2012 10:59:23 -0700 (PDT) From: Jeff Layton To: smfrench@gmail.com Cc: linux-cifs@vger.kernel.org Subject: [PATCH 10/11] cifs: remove the kmap size limit from wsize Date: Wed, 18 Jul 2012 13:59:05 -0400 Message-Id: <1342634346-22818-11-git-send-email-jlayton@redhat.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1342634346-22818-1-git-send-email-jlayton@redhat.com> References: <1342634346-22818-1-git-send-email-jlayton@redhat.com> X-Gm-Message-State: ALoCoQklgRcliTu63jqGwzMwxpo42OKvdPmhq7mkRtDKGzvlYhVst3aHqKlNiZwMfl3XAgdqfVmr Sender: linux-cifs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-cifs@vger.kernel.org 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. Signed-off-by: Jeff Layton Reviewed-by: Pavel Shilovsky --- fs/cifs/connect.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c index 99ca139..303be53 100644 --- a/fs/cifs/connect.c +++ b/fs/cifs/connect.c @@ -3491,9 +3491,6 @@ cifs_negotiate_wsize(struct cifs_tcon *tcon, struct smb_vol *pvolume_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);