From patchwork Thu Apr 24 18:15:21 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: 4053261 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 14C9DBFF02 for ; Thu, 24 Apr 2014 18:15:58 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 5015120279 for ; Thu, 24 Apr 2014 18:15:57 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 71B802034A for ; Thu, 24 Apr 2014 18:15:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932084AbaDXSPy (ORCPT ); Thu, 24 Apr 2014 14:15:54 -0400 Received: from mail-ie0-f177.google.com ([209.85.223.177]:37566 "EHLO mail-ie0-f177.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932329AbaDXSPx (ORCPT ); Thu, 24 Apr 2014 14:15:53 -0400 Received: by mail-ie0-f177.google.com with SMTP id rl12so2632983iec.8 for ; Thu, 24 Apr 2014 11:15:53 -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=EenXb8d/TZR9+GRGmaNZoxxWhv+fiITzxGdP8gBU5bk=; b=kQtt2CrsmuSztd9o1A9UKLoAVtOPa+QuPA8ufRugEH6rociSDy40RsObersbO9Lmh+ PxbjYMSF0iRF4oE7T5SKNOdTOewIuWwhaSh2Y0Gp0dtlaoM4vnCSfMCduniziuqO7rOR zhT3yU+6GQ+uQOecC5GFLEwPlWpN4F0vR9z0VAchS5DFtuLyEvYApQ4/Ps0AyagAIMBx ssxZ0NKyo0HSYCFJtSd/t+ZVPB8iIeR1ZwcHv78u4U3GgmQyrZv3YXufmMrJusPZ7nbi koLkcSejmPjjhC7tL9xXNGgKi+I+aOFuNa8IK+VcLkrHUUuIf6UH52isvhZjunTRlK+j DJBQ== X-Gm-Message-State: ALoCoQm1n0Hnm+ZKb1NVeovQUka8RB7L0MpQJR+2qFb/N+Ua80tL526r7+l9Wo45uMHbPujDXbSu X-Received: by 10.50.43.136 with SMTP id w8mr331984igl.20.1398363353231; Thu, 24 Apr 2014 11:15:53 -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 lp4sm789824igb.12.2014.04.24.11.15.51 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Thu, 24 Apr 2014 11:15:52 -0700 (PDT) From: Weston Andros Adamson To: trond.myklebust@primarydata.com Cc: linux-nfs@vger.kernel.org, Weston Andros Adamson Subject: [PATCH 11/18 v2] nfs: allow coalescing of subpage requests Date: Thu, 24 Apr 2014 14:15:21 -0400 Message-Id: <1398363328-7100-12-git-send-email-dros@primarydata.com> X-Mailer: git-send-email 1.8.5.2 (Apple Git-48) In-Reply-To: <1398363328-7100-1-git-send-email-dros@primarydata.com> References: <1398363328-7100-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 d57d675..6257f31 100644 --- a/fs/nfs/pagelist.c +++ b/fs/nfs/pagelist.c @@ -530,10 +530,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; }