From patchwork Tue Apr 22 21:29:18 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: 4036091 Return-Path: X-Original-To: patchwork-linux-nfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 639EF9F1F4 for ; Tue, 22 Apr 2014 21:29:43 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 64B58201EC for ; Tue, 22 Apr 2014 21:29:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3BB382018A for ; Tue, 22 Apr 2014 21:29:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757992AbaDVV3R (ORCPT ); Tue, 22 Apr 2014 17:29:17 -0400 Received: from mail-ie0-f177.google.com ([209.85.223.177]:55003 "EHLO mail-ie0-f177.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758802AbaDVV3N (ORCPT ); Tue, 22 Apr 2014 17:29:13 -0400 Received: by mail-ie0-f177.google.com with SMTP id rl12so66413iec.36 for ; Tue, 22 Apr 2014 14:29:12 -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=T4hMuMUsfLSNbIux3SiiDeQqQMPDRGyl4vCWAuOW8RY=; b=AHPBiC887sxpj3o7BG2v7t6m4L3iJmkjAhw8lvizx2tDG9gl90u4L//cnYpjRkuUKi Yo0T4QVLviM6MBl9pEecad/QjGq/KmKYolzw2WVJ39twRIkQ8q4+FnNsxPD+HRXtnUh8 rVpqXu7I5ctfj0Igg91VbThvY+1+AbBKPdCPUBeEQYN6SrKEfyNRGXfjNG6SRkB0Z2nk Bz6jQRNCFqYJ8nfd73Ym3mvYNpUkWNPN5iCf4jgAZI5QTJULUTgmBPRTUIUTaI6uTrOP CFN95pux9ONOZQJsLtSOaMOKZDaQOpyYrqIzp8Ys7gkLwRi+Zji+Y/unaEp18UkWkPsq cL/A== X-Gm-Message-State: ALoCoQmvm4AV/VDtu8+e8Biar7NjeUj8lZOy6nT9YkPDUMpXvYtZAHxTSSXdGmeZPQNlOJN3YG6X X-Received: by 10.42.20.193 with SMTP id h1mr10757276icb.70.1398202152638; Tue, 22 Apr 2014 14:29:12 -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 j9sm31115582igu.10.2014.04.22.14.29.11 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Tue, 22 Apr 2014 14:29:11 -0700 (PDT) From: Weston Andros Adamson To: trond.myklebust@primarydata.com Cc: linux-nfs@vger.kernel.org, Weston Andros Adamson Subject: [PATCH 10/17] nfs: allow coalescing of subpage requests Date: Tue, 22 Apr 2014 17:29:18 -0400 Message-Id: <1398202165-78897-11-git-send-email-dros@primarydata.com> X-Mailer: git-send-email 1.8.5.2 (Apple Git-48) In-Reply-To: <1398202165-78897-1-git-send-email-dros@primarydata.com> References: <1398202165-78897-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 8cb8e14..b5c4c13 100644 --- a/fs/nfs/pagelist.c +++ b/fs/nfs/pagelist.c @@ -522,10 +522,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; }