From patchwork Wed Jan 14 16:44:36 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Haynes X-Patchwork-Id: 5633331 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.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 63D5D9F9A0 for ; Wed, 14 Jan 2015 16:46:01 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 94D6720123 for ; Wed, 14 Jan 2015 16:46:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 788A520154 for ; Wed, 14 Jan 2015 16:45:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753880AbbANQpu (ORCPT ); Wed, 14 Jan 2015 11:45:50 -0500 Received: from mail-pa0-f42.google.com ([209.85.220.42]:42437 "EHLO mail-pa0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752612AbbANQps (ORCPT ); Wed, 14 Jan 2015 11:45:48 -0500 Received: by mail-pa0-f42.google.com with SMTP id et14so11570791pad.1 for ; Wed, 14 Jan 2015 08:45:48 -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=Scprqb4vi/1nc/p/+h7+KRm1S1xjSB+8Oge0QrRHPlEDjk535dP7RyRZ3QabEpqPDs KEH5mBgG7X081YYa26GEt5eXX9hZEjt7KfhlwwOdFIztS67nGqdgPQoeiB0LyxO1nyVD Z9QAyT2Eq32TywhgDZwIFfxYgThGmH+VSXUDy2TpkYkXi4lYffptdIH+8CD+pio+i9Xz qNsvYGGww57t1f1OTPsEvdeDYJZm7xtszerhB0+VZhYtUSY1T+8RYNuwXQ4Rs4rfjkmQ 1z0bZ03JMGH7415lkKvdy1wGb87HKIKHWYVivzmhcJ7SvmYxBgu9dhs3taLBNwtvn7iK HJ1g== X-Gm-Message-State: ALoCoQlwAsd+EL5nJqAL4oEUGyH0yEpvYv77twOB+qC696/EhgVUvE6QCpyqZzCPpjOllOIwXr4B X-Received: by 10.66.164.234 with SMTP id yt10mr7098116pab.110.1421253948339; Wed, 14 Jan 2015 08:45:48 -0800 (PST) Received: from localhost.localdomain ([50.242.95.105]) by mx.google.com with ESMTPSA id u7sm12239039pdp.45.2015.01.14.08.45.47 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 14 Jan 2015 08:45:47 -0800 (PST) From: Tom Haynes X-Google-Original-From: Tom Haynes To: Trond Myklebust Cc: Linux NFS Mailing list Subject: [PATCH v4 30/50] nfs: introduce pg_cleanup op for pgio descriptors Date: Wed, 14 Jan 2015 08:44:36 -0800 Message-Id: <1421253896-73106-31-git-send-email-loghyr@primarydata.com> X-Mailer: git-send-email 1.9.3 In-Reply-To: <1421253896-73106-1-git-send-email-loghyr@primarydata.com> References: <1421253896-73106-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 {