From patchwork Tue May 20 18:08:18 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Schumaker, Anna" X-Patchwork-Id: 4212451 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 2C7F7BEEAC for ; Tue, 20 May 2014 18:08:57 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 55D38201F2 for ; Tue, 20 May 2014 18:08:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 69E802017E for ; Tue, 20 May 2014 18:08:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751679AbaETSIg (ORCPT ); Tue, 20 May 2014 14:08:36 -0400 Received: from mx12.netapp.com ([216.240.18.77]:16546 "EHLO mx12.netapp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751244AbaETSIf (ORCPT ); Tue, 20 May 2014 14:08:35 -0400 X-IronPort-AV: E=Sophos;i="4.98,875,1392192000"; d="scan'208";a="165539434" Received: from vmwexceht05-prd.hq.netapp.com ([10.106.77.35]) by mx12-out.netapp.com with ESMTP; 20 May 2014 11:08:35 -0700 Received: from VMWEXCHTS01-PRD.hq.netapp.com (10.122.105.12) by vmwexceht05-prd.hq.netapp.com (10.106.77.35) with Microsoft SMTP Server (TLS) id 14.3.123.3; Tue, 20 May 2014 11:08:35 -0700 Received: from smtp2.corp.netapp.com (10.57.159.114) by VMWEXCHTS01-PRD.hq.netapp.com (10.122.105.12) with Microsoft SMTP Server id 15.0.847.32; Tue, 20 May 2014 11:08:34 -0700 Received: from davros.com (davros.ocarinaproject.vpn.netapp.com [10.63.224.110]) by smtp2.corp.netapp.com (8.13.1/8.13.1/NTAP-1.6) with ESMTP id s4KI8LYr029501; Tue, 20 May 2014 11:08:33 -0700 (PDT) From: Anna Schumaker To: , CC: , Subject: [RFC 11/12] nfs: pnfs can use nfs_generic_pgios_common() too! Date: Tue, 20 May 2014 14:08:18 -0400 Message-ID: <1400609299-32558-12-git-send-email-Anna.Schumaker@Netapp.com> X-Mailer: git-send-email 1.9.2 In-Reply-To: <1400609299-32558-1-git-send-email-Anna.Schumaker@Netapp.com> References: <1400609299-32558-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=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 We just need to take a few extra steps in case of an error. Signed-off-by: Anna Schumaker --- fs/nfs/pnfs.c | 41 ++++++++--------------------------------- 1 file changed, 8 insertions(+), 33 deletions(-) diff --git a/fs/nfs/pnfs.c b/fs/nfs/pnfs.c index b6ebea8..df07832 100644 --- a/fs/nfs/pnfs.c +++ b/fs/nfs/pnfs.c @@ -1540,34 +1540,22 @@ pnfs_try_to_write_data(struct nfs_pgio_header *hdr, int how) return NFS_SERVER(hdr->inode)->pnfs_curr_ld->write_pagelist(hdr, how); } -static void +static int pnfs_do_write(struct nfs_pageio_descriptor *desc, struct nfs_pgio_header *hdr) { if (pnfs_do_rw(desc, hdr, pnfs_try_to_write_data)) nfs_inc_stats(hdr->inode, NFSIOS_PNFS_WRITE); + return 0; } int pnfs_generic_pg_writepages(struct nfs_pageio_descriptor *desc) { - struct nfs_pgio_header *hdr; - int ret; - - hdr = nfs_pgio_header_alloc(desc->pg_rw_ops); - if (!hdr) { - desc->pg_completion_ops->error_cleanup(&desc->pg_list); - pnfs_put_lseg(desc->pg_lseg); - desc->pg_lseg = NULL; - return -ENOMEM; - } - nfs_pgheader_init(desc, hdr, pnfs_pgiohdr_free); - hdr->lseg = pnfs_get_lseg(desc->pg_lseg); - ret = nfs_generic_pgio(desc, hdr); + int ret = nfs_generic_pgios_common(desc, pnfs_pgiohdr_free, pnfs_do_write); if (ret != 0) { pnfs_put_lseg(desc->pg_lseg); desc->pg_lseg = NULL; - } else - pnfs_do_write(desc, hdr); + } return ret; } EXPORT_SYMBOL_GPL(pnfs_generic_pg_writepages); @@ -1615,35 +1603,22 @@ pnfs_try_to_read_data(struct nfs_pgio_header *hdr, int how) return NFS_SERVER(hdr->inode)->pnfs_curr_ld->read_pagelist(hdr); } -static void +static int pnfs_do_read(struct nfs_pageio_descriptor *desc, struct nfs_pgio_header *hdr) { if (pnfs_do_rw(desc, hdr, pnfs_try_to_read_data)) nfs_inc_stats(hdr->inode, NFSIOS_PNFS_READ); + return 0; } int pnfs_generic_pg_readpages(struct nfs_pageio_descriptor *desc) { - struct nfs_pgio_header *hdr; - int ret; - - hdr = nfs_pgio_header_alloc(desc->pg_rw_ops); - if (!hdr) { - desc->pg_completion_ops->error_cleanup(&desc->pg_list); - ret = -ENOMEM; - pnfs_put_lseg(desc->pg_lseg); - desc->pg_lseg = NULL; - return ret; - } - nfs_pgheader_init(desc, hdr, pnfs_pgiohdr_free); - hdr->lseg = pnfs_get_lseg(desc->pg_lseg); - ret = nfs_generic_pgio(desc, hdr); + int ret = nfs_generic_pgios_common(desc, pnfs_pgiohdr_free, pnfs_do_read); if (ret != 0) { pnfs_put_lseg(desc->pg_lseg); desc->pg_lseg = NULL; - } else - pnfs_do_read(desc, hdr); + } return ret; } EXPORT_SYMBOL_GPL(pnfs_generic_pg_readpages);