From patchwork Thu Apr 17 21:09:39 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Schumaker, Anna" X-Patchwork-Id: 4011421 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 00209C0DA2 for ; Thu, 17 Apr 2014 21:11:19 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 08700202EC for ; Thu, 17 Apr 2014 21:11:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id EF945202C8 for ; Thu, 17 Apr 2014 21:11:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751425AbaDQVLA (ORCPT ); Thu, 17 Apr 2014 17:11:00 -0400 Received: from mx12.netapp.com ([216.240.18.77]:9346 "EHLO mx12.netapp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751394AbaDQVKu (ORCPT ); Thu, 17 Apr 2014 17:10:50 -0400 X-IronPort-AV: E=Sophos;i="4.97,881,1389772800"; d="scan'208";a="158729204" Received: from vmwexceht04-prd.hq.netapp.com ([10.106.77.34]) by mx12-out.netapp.com with ESMTP; 17 Apr 2014 14:10:50 -0700 Received: from VMWEXCHTS03-PRD.hq.netapp.com (10.122.105.31) by vmwexceht04-prd.hq.netapp.com (10.106.77.34) with Microsoft SMTP Server (TLS) id 14.3.123.3; Thu, 17 Apr 2014 14:10:50 -0700 Received: from smtp1.corp.netapp.com (10.57.156.124) by VMWEXCHTS03-PRD.hq.netapp.com (10.122.105.31) with Microsoft SMTP Server id 15.0.847.32; Thu, 17 Apr 2014 14:10:31 -0700 Received: from davros.com (davros.ocarinaproject.vpn.netapp.com [10.63.233.220]) by smtp1.corp.netapp.com (8.13.1/8.13.1/NTAP-1.6) with ESMTP id s3HL9gj9021164; Thu, 17 Apr 2014 14:10:30 -0700 (PDT) From: Anna Schumaker To: , Subject: [PATCH 15/17] NFS: Create a common multiple_pgios() function Date: Thu, 17 Apr 2014 17:09:39 -0400 Message-ID: <1397768981-12856-16-git-send-email-Anna.Schumaker@Netapp.com> X-Mailer: git-send-email 1.9.2 In-Reply-To: <1397768981-12856-1-git-send-email-Anna.Schumaker@Netapp.com> References: <1397768981-12856-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.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable 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 Once again, these two functions look identical in the read and write case. Time to combine them together! Signed-off-by: Anna Schumaker --- fs/nfs/internal.h | 1 + fs/nfs/pageio.c | 29 +++++++++++++++++++++++++++++ fs/nfs/read.c | 32 ++------------------------------ fs/nfs/write.c | 31 +------------------------------ 4 files changed, 33 insertions(+), 60 deletions(-) diff --git a/fs/nfs/internal.h b/fs/nfs/internal.h index 027d72c..81c314c 100644 --- a/fs/nfs/internal.h +++ b/fs/nfs/internal.h @@ -402,6 +402,7 @@ extern void nfs_pgio_data_release(struct nfs_pgio_data *); extern int nfs_generic_pgio(struct nfs_pageio_descriptor *, struct nfs_pgio_header *); extern int nfs_initiate_pgio(struct rpc_clnt *, struct nfs_pgio_data *, const struct rpc_call_ops *, int, int); +extern int nfs_do_multiple_pgios(struct list_head *, const struct rpc_call_ops *, int); /* read.c */ extern void nfs_pageio_init_read(struct nfs_pageio_descriptor *pgio, diff --git a/fs/nfs/pageio.c b/fs/nfs/pageio.c index c80e611..4a98d54 100644 --- a/fs/nfs/pageio.c +++ b/fs/nfs/pageio.c @@ -173,6 +173,35 @@ out: } EXPORT_SYMBOL_GPL(nfs_initiate_pgio); +static int nfs_do_pgio(struct nfs_pgio_data *data, + const struct rpc_call_ops *call_ops, + int how) +{ + struct inode *inode = data->header->inode; + + return nfs_initiate_pgio(NFS_CLIENT(inode), data, call_ops, how, 0); +} + +int nfs_do_multiple_pgios(struct list_head *head, + const struct rpc_call_ops *call_ops, + int how) +{ + struct nfs_pgio_data *data; + int ret = 0; + + while (!list_empty(head)) { + int ret2; + + data = list_first_entry(head, struct nfs_pgio_data, list); + list_del_init(&data->list); + + ret2 = nfs_do_pgio(data, call_ops, how); + if (ret == 0) + ret = ret2; + } + return ret; +} + static int nfs_pgio_error(struct nfs_pageio_descriptor *desc, struct nfs_pgio_header *hdr) { diff --git a/fs/nfs/read.c b/fs/nfs/read.c index ebea335..9dd1aeb 100644 --- a/fs/nfs/read.c +++ b/fs/nfs/read.c @@ -161,34 +161,6 @@ static void nfs_initiate_read(struct nfs_pgio_data *data, struct rpc_message *ms NFS_PROTO(inode)->read_setup(data, msg); } -static int nfs_do_read(struct nfs_pgio_data *data, - const struct rpc_call_ops *call_ops) -{ - struct inode *inode = data->header->inode; - - return nfs_initiate_pgio(NFS_CLIENT(inode), data, call_ops, 0, 0); -} - -static int -nfs_do_multiple_reads(struct list_head *head, - const struct rpc_call_ops *call_ops) -{ - struct nfs_pgio_data *data; - int ret = 0; - - while (!list_empty(head)) { - int ret2; - - data = list_first_entry(head, struct nfs_pgio_data, list); - list_del_init(&data->list); - - ret2 = nfs_do_read(data, call_ops); - if (ret == 0) - ret = ret2; - } - return ret; -} - static void nfs_async_read_error(struct list_head *head) { @@ -222,8 +194,8 @@ static int nfs_generic_pg_readpages(struct nfs_pageio_descriptor *desc) atomic_inc(&hdr->refcnt); ret = nfs_generic_pgio(desc, hdr); if (ret == 0) - ret = nfs_do_multiple_reads(&hdr->rpc_list, - desc->pg_rpc_callops); + ret = nfs_do_multiple_pgios(&hdr->rpc_list, + desc->pg_rpc_callops, 0); if (atomic_dec_and_test(&hdr->refcnt)) hdr->completion_ops->completion(hdr); return ret; diff --git a/fs/nfs/write.c b/fs/nfs/write.c index 4279f80..28fdde2 100644 --- a/fs/nfs/write.c +++ b/fs/nfs/write.c @@ -945,35 +945,6 @@ static void nfs_initiate_write(struct nfs_pgio_data *data, struct rpc_message *m &task_setup_data->rpc_client, msg, data); } -static int nfs_do_write(struct nfs_pgio_data *data, - const struct rpc_call_ops *call_ops, - int how) -{ - struct inode *inode = data->header->inode; - - return nfs_initiate_pgio(NFS_CLIENT(inode), data, call_ops, how, 0); -} - -static int nfs_do_multiple_writes(struct list_head *head, - const struct rpc_call_ops *call_ops, - int how) -{ - struct nfs_pgio_data *data; - int ret = 0; - - while (!list_empty(head)) { - int ret2; - - data = list_first_entry(head, struct nfs_pgio_data, list); - list_del_init(&data->list); - - ret2 = nfs_do_write(data, call_ops, how); - if (ret == 0) - ret = ret2; - } - return ret; -} - /* If a nfs_flush_* function fails, it should remove reqs from @head and * call this on each, which will prepare them to be retried on next * writeback using standard nfs. @@ -1018,7 +989,7 @@ static int nfs_generic_pg_writepages(struct nfs_pageio_descriptor *desc) atomic_inc(&hdr->refcnt); ret = nfs_generic_pgio(desc, hdr); if (ret == 0) - ret = nfs_do_multiple_writes(&hdr->rpc_list, + ret = nfs_do_multiple_pgios(&hdr->rpc_list, desc->pg_rpc_callops, desc->pg_ioflags); if (atomic_dec_and_test(&hdr->refcnt))