From patchwork Wed Aug 9 01:40:21 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trond Myklebust X-Patchwork-Id: 9889409 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id E94A5601EB for ; Wed, 9 Aug 2017 01:40:45 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D9EB2289F1 for ; Wed, 9 Aug 2017 01:40:45 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CED8928A14; Wed, 9 Aug 2017 01:40:45 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.3 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 70846289FE for ; Wed, 9 Aug 2017 01:40:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752448AbdHIBko (ORCPT ); Tue, 8 Aug 2017 21:40:44 -0400 Received: from mail-io0-f193.google.com ([209.85.223.193]:34176 "EHLO mail-io0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752033AbdHIBkn (ORCPT ); Tue, 8 Aug 2017 21:40:43 -0400 Received: by mail-io0-f193.google.com with SMTP id m88so3685236iod.1 for ; Tue, 08 Aug 2017 18:40:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references; bh=i18IkOAq8sbyRXzMxfI4I32IQDDX2bzORT+kmqX9A/0=; b=ZCmGWFyN6x2A0JsSqkk6mXR2fteGZ3yEnWDzjyHVUjOgCAgcG3QdzTjfm7ddmYaNUZ hXJQNlYGezwLL7ulqEsfacpNhTot/NQDwfuKQIXH2sWP3VFPRG4XZzlqr3ipL3DzK8hM zRNMwWlod8PB7tAg0l8P652/fvIPgeY1pEXo7E5R+bDoS7sFNYVArSr23lJ/U3lXbb2a MQImOdpU5fpiU+owrD0W+LDv2b9ahHhF3XIW92f0KUhDuWIn0ayWtQaRgn5BK9VE+iwO aqcNoHk9/znB8ez6e3mRlQzAeZZOL9jLwyfN64zpgKV3CJaOtL3OVc5RyQ+uzZeGepRu THig== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references; bh=i18IkOAq8sbyRXzMxfI4I32IQDDX2bzORT+kmqX9A/0=; b=n86Rv67hg3NDY3tD9F9eewJv99m7Ez7MQzjPLDaqSMfRX2izOGyLrafaspToY7qP29 dUOEo2n9gLylgLkEVGF7ILBQa8gqhex2aVUAUyU0NTMA749lJcqE9i3Gp2dOKXrHGSLk azz/dcYQnWxtDL2D2Ci5fm1KFS5vqSL7TXhg9+7+hQxrcRhd9WHX6PkhuHaTC7Vgime6 tFr16PIEZzqpjM24bI/SEoVla4RSVRSI2jh7Qhc2C9snCS2yvmrrI+ZfAt49oJxojsN8 ee57ItZ2vF+D5xdxvk77eUUmeFC/71bhcFlydfrIyW7i9UbvhW/ilFJuFnFfsDOo4vj9 bNfg== X-Gm-Message-State: AIVw111ajsDrQcLvTdMwrLOpFAByJoLYSA6yuA9btY+5Btqsa/rBbn32 jPto4x4TA3iJ4yh+j3g= X-Received: by 10.107.169.193 with SMTP id f62mr5678106ioj.205.1502242842976; Tue, 08 Aug 2017 18:40:42 -0700 (PDT) Received: from localhost.localdomain (50-108-95-251.adr01.mskg.mi.frontiernet.net. [50.108.95.251]) by smtp.gmail.com with ESMTPSA id r40sm1320994ioi.57.2017.08.08.18.40.42 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 08 Aug 2017 18:40:42 -0700 (PDT) From: Trond Myklebust To: linux-nfs@vger.kernel.org Subject: [PATCH 2/2] NFSv4: Use the nfs4_state being recovered in _nfs4_opendata_to_nfs4_state() Date: Tue, 8 Aug 2017 21:40:21 -0400 Message-Id: <20170809014021.42909-2-trond.myklebust@primarydata.com> X-Mailer: git-send-email 2.13.4 In-Reply-To: <20170809014021.42909-1-trond.myklebust@primarydata.com> References: <20170809014021.42909-1-trond.myklebust@primarydata.com> Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP If we're recovering a nfs4_state, then we should try to use that instead of looking up a new stateid. Only do that if the inodes match, though. Signed-off-by: Trond Myklebust --- fs/nfs/nfs4proc.c | 41 +++++++++++++++++++++++++---------------- 1 file changed, 25 insertions(+), 16 deletions(-) diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c index 71c469bd1ae9..08cc97488904 100644 --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c @@ -1682,11 +1682,29 @@ nfs4_opendata_get_inode(struct nfs4_opendata *data) } static struct nfs4_state * -_nfs4_opendata_to_nfs4_state(struct nfs4_opendata *data) +nfs4_opendata_find_nfs4_state(struct nfs4_opendata *data) { + struct nfs4_state *state; struct inode *inode; - struct nfs4_state *state = NULL; - int ret; + + inode = nfs4_opendata_get_inode(data); + if (IS_ERR(inode)) + return ERR_CAST(inode); + if (data->state != NULL && data->state->inode == inode) { + state = data->state; + atomic_inc(&state->count); + } else + state = nfs4_get_open_state(inode, data->owner); + iput(inode); + if (state == NULL) + state = ERR_PTR(-ENOMEM); + return state; +} + +static struct nfs4_state * +_nfs4_opendata_to_nfs4_state(struct nfs4_opendata *data) +{ + struct nfs4_state *state; if (!data->rpc_done) { state = nfs4_try_open_cached(data); @@ -1694,26 +1712,17 @@ _nfs4_opendata_to_nfs4_state(struct nfs4_opendata *data) goto out; } - inode = nfs4_opendata_get_inode(data); - ret = PTR_ERR(inode); - if (IS_ERR(inode)) - goto err; - ret = -ENOMEM; - state = nfs4_get_open_state(inode, data->owner); - if (state == NULL) - goto err_put_inode; + state = nfs4_opendata_find_nfs4_state(data); + if (IS_ERR(state)) + goto out; + if (data->o_res.delegation_type != 0) nfs4_opendata_check_deleg(data, state); update_open_stateid(state, &data->o_res.stateid, NULL, data->o_arg.fmode); - iput(inode); out: nfs_release_seqid(data->o_arg.seqid); return state; -err_put_inode: - iput(inode); -err: - return ERR_PTR(ret); } static struct nfs4_state *