From patchwork Mon Aug 6 11:31:06 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Layton X-Patchwork-Id: 1278461 Return-Path: X-Original-To: patchwork-cifs-client@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 9E93EDF215 for ; Mon, 6 Aug 2012 11:31:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755993Ab2HFLbc (ORCPT ); Mon, 6 Aug 2012 07:31:32 -0400 Received: from mail-yw0-f46.google.com ([209.85.213.46]:51153 "EHLO mail-yw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756011Ab2HFLbb (ORCPT ); Mon, 6 Aug 2012 07:31:31 -0400 Received: by mail-yw0-f46.google.com with SMTP id m54so2324520yhm.19 for ; Mon, 06 Aug 2012 04:31:31 -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=RDvV5HQLr9Dom6BlXC+FdVlFlzLEWWb4FaZ+RVh0Ldw=; b=ZqUhFsNh5SMm0hPP5kdDWIJvdP9t9wzgvNfKa7OTd8pxW18CkGbihcLgRm/25pFc4C jeS6MzDC61JF+jeOzIT3e4gC8z1eMPwnlOSu9Di250xDkfMnG9msEpkul3BThWSJ09RF YcqdaMtgSeks/RBhsWEj3shRsUCOyIFXU/h2OA/aEBpUD0lD4up93fxRorYhzt4uZlh9 3vMGZj2FaUCIm7ENoSTcxfomUohsCQ2xM/QXVjHFgqrW1APU3fyLiz1KPCUCm/8ZuPKG Hg04KDEdcnbJm7zf7vKwJkU5FqActA6iz8rLzhj9Sf+X0LljAe+xkPMrrVzdyiCojs3L abOg== Received: by 10.236.184.201 with SMTP id s49mr9516940yhm.110.1344252691655; Mon, 06 Aug 2012 04:31:31 -0700 (PDT) Received: from salusa.poochiereds.net (cpe-069-134-145-027.nc.res.rr.com. [69.134.145.27]) by mx.google.com with ESMTPS id r25sm31198420yhi.13.2012.08.06.04.31.30 (version=SSLv3 cipher=OTHER); Mon, 06 Aug 2012 04:31:31 -0700 (PDT) From: Jeff Layton To: smfrench@gmail.com Cc: linux-cifs@vger.kernel.org, piastryyy@gmail.com Subject: [PATCH v3 09/15] cifs: remove the kmap size limit from wsize Date: Mon, 6 Aug 2012 07:31:06 -0400 Message-Id: <1344252672-15244-10-git-send-email-jlayton@redhat.com> X-Mailer: git-send-email 1.7.11.2 In-Reply-To: <1344252672-15244-1-git-send-email-jlayton@redhat.com> References: <1344252672-15244-1-git-send-email-jlayton@redhat.com> X-Gm-Message-State: ALoCoQniT5VjJ4QKR7HD3uJ49w9Ig4M29+y8Rd9yE1cPjZYGs4nqVUlTVTTGo2JFoalT9i+Ai73Q 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. Reviewed-by: Pavel Shilovsky Signed-off-by: Jeff Layton --- fs/cifs/smb1ops.c | 3 --- fs/cifs/smb2ops.c | 3 --- 2 files changed, 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; }