From patchwork Thu May 15 15:56:51 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: 4183461 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 AFFE9BFF02 for ; Thu, 15 May 2014 15:57:34 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D8104201FE for ; Thu, 15 May 2014 15:57:33 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id BF0E42037E for ; Thu, 15 May 2014 15:57:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755172AbaEOP5a (ORCPT ); Thu, 15 May 2014 11:57:30 -0400 Received: from mail-ig0-f171.google.com ([209.85.213.171]:63160 "EHLO mail-ig0-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753375AbaEOP51 (ORCPT ); Thu, 15 May 2014 11:57:27 -0400 Received: by mail-ig0-f171.google.com with SMTP id c1so8095817igq.4 for ; Thu, 15 May 2014 08:57:26 -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=hVMwMokd3CUrE2KcaFuV5UjaDVN2BM3YqiE7ZUuKwZo=; b=aVnwOZnIyILZlPYFg3torWteLTjUfghu9yIKNvPmkp0ZhVgkTNneLaDSXl33/Czbdo tTLhTrXNd7+7o9Vk0bPVUilR2Dz8bYVjT8nZcIOciND4Wb96yo+2RFSC1V1t89MtX2nQ T2pEIXBdwjKqopX9ugcjHRGgBUCAEstUQAxIV+e75/VRXAvsO6OWmjnFI1bWtkioqmKG LtzqqNAGXc3noty0WL3SatWSQzn1C082fCnHGa4sZGIn+TprviumOYF9eXlnitRTyAz3 QLrtgui6XFbLFiWBP4Btps1CxWA6CoHSZZAEpv4A7T3Y+ibyNgnTMRGzP6zByxVTkCmm HTAg== X-Gm-Message-State: ALoCoQnJ0JXovnU2JwlFWATyOZ/cDVvfqQq0plaYSlDib3+4NpEYiGKaM+Os0XEhn93JHcOSOASm X-Received: by 10.50.46.100 with SMTP id u4mr13452151igm.23.1400169446548; Thu, 15 May 2014 08:57:26 -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.24 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Thu, 15 May 2014 08:57:25 -0700 (PDT) From: Weston Andros Adamson To: trond.myklebust@primarydata.com Cc: linux-nfs@vger.kernel.org, Weston Andros Adamson Subject: [PATCH v3 12/18] nfs: chain calls to pg_test Date: Thu, 15 May 2014 11:56:51 -0400 Message-Id: <1400169417-28245-13-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 Now that pg_test can change the size of the request (by returning a non-zero size smaller than the request), pg_test functions that call other pg_test functions must return the minimum of the result - or 0 if any fail. Also clean up the logic of some pg_test functions so that all checks are for contitions where coalescing is not possible. Signed-off-by: Weston Andros Adamson --- fs/nfs/nfs4filelayout.c | 27 ++++++++++++++------------- fs/nfs/objlayout/objio_osd.c | 9 ++++++--- fs/nfs/pnfs.c | 15 ++++++++++----- 3 files changed, 30 insertions(+), 21 deletions(-) diff --git a/fs/nfs/nfs4filelayout.c b/fs/nfs/nfs4filelayout.c index 9cea935..7a665e0 100644 --- a/fs/nfs/nfs4filelayout.c +++ b/fs/nfs/nfs4filelayout.c @@ -928,26 +928,27 @@ static size_t filelayout_pg_test(struct nfs_pageio_descriptor *pgio, struct nfs_page *prev, struct nfs_page *req) { + unsigned int size; u64 p_stripe, r_stripe; u32 stripe_unit; - if (!pnfs_generic_pg_test(pgio, prev, req) || - !nfs_generic_pg_test(pgio, prev, req)) + /* calls nfs_generic_pg_test */ + size = pnfs_generic_pg_test(pgio, prev, req); + if (!size) return 0; - if (!prev) - return req->wb_bytes; + if (prev) { + p_stripe = (u64)req_offset(prev); + r_stripe = (u64)req_offset(req); + stripe_unit = FILELAYOUT_LSEG(pgio->pg_lseg)->stripe_unit; - p_stripe = (u64)req_offset(prev); - r_stripe = (u64)req_offset(req); - stripe_unit = FILELAYOUT_LSEG(pgio->pg_lseg)->stripe_unit; + do_div(p_stripe, stripe_unit); + do_div(r_stripe, stripe_unit); - do_div(p_stripe, stripe_unit); - do_div(r_stripe, stripe_unit); - - if (p_stripe == r_stripe) - return req->wb_bytes; - return 0; + if (p_stripe != r_stripe) + return 0; + } + return min(size, req->wb_bytes); } static void diff --git a/fs/nfs/objlayout/objio_osd.c b/fs/nfs/objlayout/objio_osd.c index 71b9c69..6113207 100644 --- a/fs/nfs/objlayout/objio_osd.c +++ b/fs/nfs/objlayout/objio_osd.c @@ -571,12 +571,15 @@ int objio_write_pagelist(struct nfs_pgio_data *wdata, int how) static size_t objio_pg_test(struct nfs_pageio_descriptor *pgio, struct nfs_page *prev, struct nfs_page *req) { - if (!pnfs_generic_pg_test(pgio, prev, req) || - pgio->pg_count + req->wb_bytes > + unsigned int size; + + size = pnfs_generic_pg_test(pgio, prev, req); + + if (!size || pgio->pg_count + req->wb_bytes > (unsigned long)pgio->pg_layout_private) return 0; - return req->wb_bytes; + return min(size, req->wb_bytes); } static void objio_init_read(struct nfs_pageio_descriptor *pgio, struct nfs_page *req) diff --git a/fs/nfs/pnfs.c b/fs/nfs/pnfs.c index de6eb16..354c53c 100644 --- a/fs/nfs/pnfs.c +++ b/fs/nfs/pnfs.c @@ -1442,8 +1442,12 @@ size_t pnfs_generic_pg_test(struct nfs_pageio_descriptor *pgio, struct nfs_page *prev, struct nfs_page *req) { - if (pgio->pg_lseg == NULL) - return nfs_generic_pg_test(pgio, prev, req); + unsigned int size; + + size = nfs_generic_pg_test(pgio, prev, req); + + if (!size) + return 0; /* * Test if a nfs_page is fully contained in the pnfs_layout_range. @@ -1459,10 +1463,11 @@ pnfs_generic_pg_test(struct nfs_pageio_descriptor *pgio, struct nfs_page *prev, * first byte that lies outside the pnfs_layout_range. FIXME? * */ - if (req_offset(req) < end_offset(pgio->pg_lseg->pls_range.offset, + if (req_offset(req) >= end_offset(pgio->pg_lseg->pls_range.offset, pgio->pg_lseg->pls_range.length)) - return req->wb_bytes; - return 0; + return 0; + + return min(size, req->wb_bytes); } EXPORT_SYMBOL_GPL(pnfs_generic_pg_test);