From patchwork Tue May 6 13:12:33 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Schumaker, Anna" X-Patchwork-Id: 4121131 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 3DF729F1E1 for ; Tue, 6 May 2014 13:13:26 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 4A608201DE for ; Tue, 6 May 2014 13:13:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 475C72010F for ; Tue, 6 May 2014 13:13:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752522AbaEFNNI (ORCPT ); Tue, 6 May 2014 09:13:08 -0400 Received: from mx11.netapp.com ([216.240.18.76]:32910 "EHLO mx11.netapp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751291AbaEFNNE (ORCPT ); Tue, 6 May 2014 09:13:04 -0400 X-IronPort-AV: E=Sophos;i="4.97,997,1389772800"; d="scan'208";a="121468184" Received: from vmwexceht02-prd.hq.netapp.com ([10.106.76.240]) by mx11-out.netapp.com with ESMTP; 06 May 2014 06:12:59 -0700 Received: from VMWEXCHTS03-PRD.hq.netapp.com (10.122.105.31) by vmwexceht02-prd.hq.netapp.com (10.106.76.240) with Microsoft SMTP Server (TLS) id 14.3.123.3; Tue, 6 May 2014 06:12:58 -0700 Received: from smtp2.corp.netapp.com (10.57.159.114) by VMWEXCHTS03-PRD.hq.netapp.com (10.122.105.31) with Microsoft SMTP Server id 15.0.847.32; Tue, 6 May 2014 06:12:57 -0700 Received: from davros.com (davros.ocarinaproject.vpn.netapp.com [10.63.232.28]) by smtp2.corp.netapp.com (8.13.1/8.13.1/NTAP-1.6) with ESMTP id s46DCfES000665; Tue, 6 May 2014 06:12:57 -0700 (PDT) From: Anna Schumaker To: , CC: , Subject: [PATCH v3 10/17] NFS: Create a common rpc_call_ops struct Date: Tue, 6 May 2014 09:12:33 -0400 Message-ID: <1399381960-3019-11-git-send-email-Anna.Schumaker@Netapp.com> X-Mailer: git-send-email 1.9.2 In-Reply-To: <1399381960-3019-1-git-send-email-Anna.Schumaker@Netapp.com> References: <1399381960-3019-1-git-send-email-Anna.Schumaker@Netapp.com> MIME-Version: 1.0 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 From: Anna Schumaker The read and write paths set up this struct in exactly the same way, so create a single shared struct. Signed-off-by: Anna Schumaker --- fs/nfs/internal.h | 4 +--- fs/nfs/pagelist.c | 11 ++++++++--- fs/nfs/read.c | 11 ++--------- fs/nfs/write.c | 11 ++--------- 4 files changed, 13 insertions(+), 24 deletions(-) diff --git a/fs/nfs/internal.h b/fs/nfs/internal.h index 7c0ae36..e34220f 100644 --- a/fs/nfs/internal.h +++ b/fs/nfs/internal.h @@ -237,13 +237,11 @@ extern void nfs_pgheader_init(struct nfs_pageio_descriptor *desc, void nfs_set_pgio_error(struct nfs_pgio_header *hdr, int error, loff_t pos); int nfs_iocounter_wait(struct nfs_io_counter *c); +extern const struct rpc_call_ops nfs_pgio_common_ops; struct nfs_rw_header *nfs_rw_header_alloc(const struct nfs_rw_ops *); void nfs_rw_header_free(struct nfs_pgio_header *); struct nfs_pgio_data *nfs_pgio_data_alloc(struct nfs_pgio_header *, unsigned int); void nfs_pgio_data_release(struct nfs_pgio_data *); -void nfs_pgio_prepare(struct rpc_task *, void *); -void nfs_pgio_release(void *); -void nfs_pgio_result(struct rpc_task *, void *); static inline void nfs_iocounter_init(struct nfs_io_counter *c) { diff --git a/fs/nfs/pagelist.c b/fs/nfs/pagelist.c index f74df87..aabff78 100644 --- a/fs/nfs/pagelist.c +++ b/fs/nfs/pagelist.c @@ -393,7 +393,7 @@ EXPORT_SYMBOL_GPL(nfs_pgio_data_release); * @task: The current task * @calldata: pageio data to prepare */ -void nfs_pgio_prepare(struct rpc_task *task, void *calldata) +static void nfs_pgio_prepare(struct rpc_task *task, void *calldata) { struct nfs_pgio_data *data = calldata; int err; @@ -406,7 +406,7 @@ void nfs_pgio_prepare(struct rpc_task *task, void *calldata) * nfs_pgio_release - Release pageio data * @calldata: The pageio data to release */ -void nfs_pgio_release(void *calldata) +static void nfs_pgio_release(void *calldata) { struct nfs_pgio_data *data = calldata; if (data->header->rw_ops->rw_release) @@ -454,7 +454,7 @@ EXPORT_SYMBOL_GPL(nfs_pageio_init); * @task: The task that ran * @calldata: Pageio data to check */ -void nfs_pgio_result(struct rpc_task *task, void *calldata) +static void nfs_pgio_result(struct rpc_task *task, void *calldata) { struct nfs_pgio_data *data = calldata; struct inode *inode = data->header->inode; @@ -677,3 +677,8 @@ void nfs_destroy_nfspagecache(void) kmem_cache_destroy(nfs_page_cachep); } +const struct rpc_call_ops nfs_pgio_common_ops = { + .rpc_call_prepare = nfs_pgio_prepare, + .rpc_call_done = nfs_pgio_result, + .rpc_release = nfs_pgio_release, +}; diff --git a/fs/nfs/read.c b/fs/nfs/read.c index bc78bd2..a33490c 100644 --- a/fs/nfs/read.c +++ b/fs/nfs/read.c @@ -29,7 +29,6 @@ #define NFSDBG_FACILITY NFSDBG_PAGECACHE static const struct nfs_pageio_ops nfs_pageio_read_ops; -static const struct rpc_call_ops nfs_read_common_ops; static const struct nfs_pgio_completion_ops nfs_async_read_completion_ops; static const struct nfs_rw_ops nfs_rw_read_ops; @@ -314,7 +313,7 @@ static int nfs_pagein_multi(struct nfs_pageio_descriptor *desc, nfs_list_remove_request(req); nfs_list_add_request(req, &hdr->pages); - desc->pg_rpc_callops = &nfs_read_common_ops; + desc->pg_rpc_callops = &nfs_pgio_common_ops; return 0; } @@ -343,7 +342,7 @@ static int nfs_pagein_one(struct nfs_pageio_descriptor *desc, nfs_read_rpcsetup(data, desc->pg_count, 0); list_add(&data->list, &hdr->rpc_list); - desc->pg_rpc_callops = &nfs_read_common_ops; + desc->pg_rpc_callops = &nfs_pgio_common_ops; return 0; } @@ -443,12 +442,6 @@ static void nfs_readpage_result(struct rpc_task *task, struct nfs_pgio_data *dat nfs_readpage_retry(task, data); } -static const struct rpc_call_ops nfs_read_common_ops = { - .rpc_call_prepare = nfs_pgio_prepare, - .rpc_call_done = nfs_pgio_result, - .rpc_release = nfs_pgio_release, -}; - /* * Read a page over NFS. * We read the page synchronously in the following case: diff --git a/fs/nfs/write.c b/fs/nfs/write.c index 1d3e1d7..d877f15 100644 --- a/fs/nfs/write.c +++ b/fs/nfs/write.c @@ -42,7 +42,6 @@ * Local function declarations */ static void nfs_redirty_request(struct nfs_page *req); -static const struct rpc_call_ops nfs_write_common_ops; static const struct rpc_call_ops nfs_commit_ops; static const struct nfs_pgio_completion_ops nfs_async_write_completion_ops; static const struct nfs_commit_completion_ops nfs_commit_completion_ops; @@ -1138,7 +1137,7 @@ static int nfs_flush_multi(struct nfs_pageio_descriptor *desc, } while (nbytes != 0); nfs_list_remove_request(req); nfs_list_add_request(req, &hdr->pages); - desc->pg_rpc_callops = &nfs_write_common_ops; + desc->pg_rpc_callops = &nfs_pgio_common_ops; return 0; } @@ -1182,7 +1181,7 @@ static int nfs_flush_one(struct nfs_pageio_descriptor *desc, /* Set up the argument struct */ nfs_write_rpcsetup(data, desc->pg_count, 0, desc->pg_ioflags, &cinfo); list_add(&data->list, &hdr->rpc_list); - desc->pg_rpc_callops = &nfs_write_common_ops; + desc->pg_rpc_callops = &nfs_pgio_common_ops; return 0; } @@ -1272,12 +1271,6 @@ static void nfs_writeback_release_common(struct nfs_pgio_data *data) } } -static const struct rpc_call_ops nfs_write_common_ops = { - .rpc_call_prepare = nfs_pgio_prepare, - .rpc_call_done = nfs_pgio_result, - .rpc_release = nfs_pgio_release, -}; - /* * Special version of should_remove_suid() that ignores capabilities. */