From patchwork Thu May 15 15:56:50 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Weston Andros Adamson X-Patchwork-Id: 4183451 Return-Path: X-Original-To: patchwork-linux-nfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 01E9FBFF02 for ; Thu, 15 May 2014 15:57:33 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 10BAF20379 for ; Thu, 15 May 2014 15:57:32 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 44D94201FE for ; Thu, 15 May 2014 15:57:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755107AbaEOP51 (ORCPT ); Thu, 15 May 2014 11:57:27 -0400 Received: from mail-ig0-f176.google.com ([209.85.213.176]:40818 "EHLO mail-ig0-f176.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755172AbaEOP5Z (ORCPT ); Thu, 15 May 2014 11:57:25 -0400 Received: by mail-ig0-f176.google.com with SMTP id hl10so8102870igb.3 for ; Thu, 15 May 2014 08:57:24 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=5DxyRBheF8dIzjUEnAB2q00EldpuCrUP9lNTKbPTeoA=; b=Rc3jV41O9OrIglFWIk1FNr1Ztk2cjXjSEwm3vzrRP532JyI6vsKxvAV2oEXv9m+jOL wzqXutAYccPdzYhNIJfH9eWjbgAVNnmu98zvNRdXzd2VmwpWxYmNJn4BNfoqieMQ724G bLn1BiV8tByx9K5N9gme50jkVi4yWmkNCGpFyDkzaaKb70PMGBRXkoZAgmnIbeP8/+lF TFltRMFszlDtSZbCEfzY7JHpU0RsyNSaOhMXyoyAL8pw+0KtO6isOpd5LdkmaHZ3LeOW 269SMsOrWZvvfk/+McDQmImc/S6e2FZj2veJBeilwNTWDySgVneuXsgfNj2UvM6c4vfc 0Tbw== X-Gm-Message-State: ALoCoQluD4ETOcQf1PJW/WQnNBw4uepMhT8QGMDBtD7iuY+MwkD4O/xAtdo3QA4YFJnyb7b/sBrv X-Received: by 10.50.73.232 with SMTP id o8mr72428704igv.1.1400169444608; Thu, 15 May 2014 08:57:24 -0700 (PDT) Received: from gavrio-wifi.robotsandstuff.fake (c-98-209-19-144.hsd1.mi.comcast.net. [98.209.19.144]) by mx.google.com with ESMTPSA id jf5sm13964856igb.19.2014.05.15.08.57.22 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Thu, 15 May 2014 08:57:23 -0700 (PDT) From: Weston Andros Adamson To: trond.myklebust@primarydata.com Cc: linux-nfs@vger.kernel.org, Weston Andros Adamson Subject: [PATCH v3 11/18] nfs: allow coalescing of subpage requests Date: Thu, 15 May 2014 11:56:50 -0400 Message-Id: <1400169417-28245-12-git-send-email-dros@primarydata.com> X-Mailer: git-send-email 1.8.5.2 (Apple Git-48) In-Reply-To: <1400169417-28245-1-git-send-email-dros@primarydata.com> References: <1400169417-28245-1-git-send-email-dros@primarydata.com> Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Spam-Status: No, score=-7.5 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Remove check that the request covers a whole page. Signed-off-by: Weston Andros Adamson --- fs/nfs/pagelist.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/fs/nfs/pagelist.c b/fs/nfs/pagelist.c index ce3faad..44aef5a 100644 --- a/fs/nfs/pagelist.c +++ b/fs/nfs/pagelist.c @@ -922,10 +922,6 @@ static bool nfs_can_coalesce_requests(struct nfs_page *prev, !nfs_match_lock_context(req->wb_lock_context, prev->wb_lock_context)) return false; - if (req->wb_pgbase != 0) - return false; - if (prev->wb_pgbase + prev->wb_bytes != PAGE_CACHE_SIZE) - return false; if (req_offset(req) != req_offset(prev) + prev->wb_bytes) return false; }