From patchwork Thu Jan 22 23:36:02 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Haynes X-Patchwork-Id: 5689611 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.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 1339BC058D for ; Thu, 22 Jan 2015 23:37:50 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 4776420272 for ; Thu, 22 Jan 2015 23:37:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6BE0A2026F for ; Thu, 22 Jan 2015 23:37:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754552AbbAVXhr (ORCPT ); Thu, 22 Jan 2015 18:37:47 -0500 Received: from mail-pd0-f182.google.com ([209.85.192.182]:60360 "EHLO mail-pd0-f182.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754442AbbAVXhr (ORCPT ); Thu, 22 Jan 2015 18:37:47 -0500 Received: by mail-pd0-f182.google.com with SMTP id z10so2243222pdj.13 for ; Thu, 22 Jan 2015 15:37:46 -0800 (PST) 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=5IfF1koQ68ETXle6Wakch/inCWuqJ4r4ECU4m7B5OhA=; b=HnS37lqcw+m+m/eqzoeWoIHCPjhpmSr1SOULtYl2GsSW33bQSDG9cD7tdizWodUtP+ qXJabWAWXxgHrERfx657BoePeKi2mFbDcn3PS/Tld4/xpXY1OJsKkZv/Xat8regS+Uj2 JvaPu+VLQGMZ2z9Eh10CHU8VWOBhIdmQs4kHamA9XI6fQOrmhYmZHnjB+M5G2Hcml1MI laKnyQCTfYqExvHYcxHg4hAI8rk927WzEc1C/b8GxsmkTzHUhlHn4Ij9L33WqRQQIBl1 Ze2DWu7CZ6NZvGlfsmpsKjvOAsra2ihDcxcKWa/YTokLiXmbVJ41bkYVuStl5hmTO/ez RNYA== X-Gm-Message-State: ALoCoQlVb0ySmo4NJhHUr+x6+znhKK6Pa4lIfRL8cOFRNoopjqL+lwSeJ/wisSN98LLu6HTgxxcr X-Received: by 10.70.140.72 with SMTP id re8mr6340614pdb.144.1421969866668; Thu, 22 Jan 2015 15:37:46 -0800 (PST) Received: from localhost.localdomain ([50.242.95.105]) by mx.google.com with ESMTPSA id fu1sm366817pdb.80.2015.01.22.15.37.45 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 22 Jan 2015 15:37:46 -0800 (PST) From: Tom Haynes X-Google-Original-From: Tom Haynes To: Trond Myklebust Cc: Linux NFS Mailing list Subject: [PATCH v5 30/51] nfs: introduce pg_cleanup op for pgio descriptors Date: Thu, 22 Jan 2015 15:36:02 -0800 Message-Id: <1421969783-92997-31-git-send-email-loghyr@primarydata.com> X-Mailer: git-send-email 1.9.3 In-Reply-To: <1421969783-92997-1-git-send-email-loghyr@primarydata.com> References: <1421969783-92997-1-git-send-email-loghyr@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=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_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 From: Weston Andros Adamson Add a new operation to nfs_pageio_ops that is called on nfs_pageio_complete. Signed-off-by: Weston Andros Adamson --- fs/nfs/pagelist.c | 5 ++++- include/linux/nfs_page.h | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/fs/nfs/pagelist.c b/fs/nfs/pagelist.c index c4d1758..1c03187 100644 --- a/fs/nfs/pagelist.c +++ b/fs/nfs/pagelist.c @@ -1050,7 +1050,7 @@ int nfs_pageio_resend(struct nfs_pageio_descriptor *desc, EXPORT_SYMBOL_GPL(nfs_pageio_resend); /** - * nfs_pageio_complete - Complete I/O on an nfs_pageio_descriptor + * nfs_pageio_complete - Complete I/O then cleanup an nfs_pageio_descriptor * @desc: pointer to io descriptor */ void nfs_pageio_complete(struct nfs_pageio_descriptor *desc) @@ -1062,6 +1062,9 @@ void nfs_pageio_complete(struct nfs_pageio_descriptor *desc) if (!nfs_do_recoalesce(desc)) break; } + + if (desc->pg_ops->pg_cleanup) + desc->pg_ops->pg_cleanup(desc); } /** diff --git a/include/linux/nfs_page.h b/include/linux/nfs_page.h index 4c3aa80..479c566 100644 --- a/include/linux/nfs_page.h +++ b/include/linux/nfs_page.h @@ -58,6 +58,7 @@ struct nfs_pageio_ops { size_t (*pg_test)(struct nfs_pageio_descriptor *, struct nfs_page *, struct nfs_page *); int (*pg_doio)(struct nfs_pageio_descriptor *); + void (*pg_cleanup)(struct nfs_pageio_descriptor *); }; struct nfs_rw_ops {