From patchwork Fri Nov 3 11:35:39 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trond Myklebust X-Patchwork-Id: 10039845 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 EFBFF6032D for ; Fri, 3 Nov 2017 11:36:12 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EF160295B1 for ; Fri, 3 Nov 2017 11:36:12 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E434A295B8; Fri, 3 Nov 2017 11:36:12 +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 95C64295B1 for ; Fri, 3 Nov 2017 11:36:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756092AbdKCLgJ (ORCPT ); Fri, 3 Nov 2017 07:36:09 -0400 Received: from mail-io0-f195.google.com ([209.85.223.195]:49479 "EHLO mail-io0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756014AbdKCLgH (ORCPT ); Fri, 3 Nov 2017 07:36:07 -0400 Received: by mail-io0-f195.google.com with SMTP id n137so5566318iod.6 for ; Fri, 03 Nov 2017 04:36:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=/rvaiJULidP/HPHV7QRN8aawCOpfGjBnXAbUl69Gvv4=; b=vUl1CQwWbV5UX4VOTz2f7HDX7vOf4i/r2i7/nSkgjD3NPUyc1ZlMsFMgZ6dW1x1MFN jia7Nwe8otr3XALQlc8wIMHDT0tFup7n6piFNWH0nmKG3AH0CTd7gYDyyrk8RigrHczj ycwKkTv5IW1ZpWOwFACt6SoOWfZN1gCuQ4G94wFLUtxHksk8TqUJ6Lyr4vKsnEhqhjpc 3T/dakCDxCAGA0E0v96cTagEjDWKP7bGo8PoKzmrmyORYkooOuZ6aE6PXlViHOdRyqyU TaZLsmm+PpvSU0S+1deT4J3odju6CPhZkpzyFp1eTRpW4m+0fQC2vQzczw8R0x0aAoic UwqQ== 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:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=/rvaiJULidP/HPHV7QRN8aawCOpfGjBnXAbUl69Gvv4=; b=LgcaufLJqhSySsnRbiEiy7FmRhVK2EsiTjI3cx6mSLRPxYVVdbl82/gsjOMEYIDM66 SrpsNNSWS33Nk9km8QFRLU89weAnE/JJgdoeSDVLM33ABUCEjWNSX1Ymfx6ABZg8enHb D24x0NBWrOYXarEDeQzy4+0Y5XlLlgjnwSI3+QblDReZmZOb/s771goyEtNFAmRiD66e 39OZe1QX7uRUjiDmDkpSR4AorE+AopAQRr9uVrDz/GH+5n/Ky4MKTecF+ppjgyf/PJcv t/pE8vR8ViXJe+jHv4aOD3jbX9pxXBSTt9hhwEezac0Bw+/mutLTHgnHvnut2FAc+5fL 1hqA== X-Gm-Message-State: AMCzsaVqNdGrcfRaBE8IM00djllaokbSeeYz00FebU2a0PnFn0iWcTCu NToTRg0NxCPkIZWqpoJS3UKu1ng= X-Google-Smtp-Source: ABhQp+R4SAiJleK8hWd0Dhu8TDjYCibktV2zooT8X58mZ1Ut8GPWE87WrGgKCmKC6OB9lLUVvyY9ZQ== X-Received: by 10.36.219.87 with SMTP id c84mr6790932itg.73.1509708966280; Fri, 03 Nov 2017 04:36:06 -0700 (PDT) Received: from localhost.localdomain (c-68-49-162-121.hsd1.mi.comcast.net. [68.49.162.121]) by smtp.gmail.com with ESMTPSA id k2sm2667287iok.43.2017.11.03.04.36.05 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 03 Nov 2017 04:36:05 -0700 (PDT) From: Trond Myklebust To: Benjamin Coddington , Anna Schumaker Cc: linux-nfs@vger.kernel.org Subject: [PATCH v5 10/10] NFSv4: Clean up nfs4_delegreturn_done Date: Fri, 3 Nov 2017 07:35:39 -0400 Message-Id: <20171103113539.5551-11-trond.myklebust@primarydata.com> X-Mailer: git-send-email 2.13.6 In-Reply-To: <20171103113539.5551-10-trond.myklebust@primarydata.com> References: <20171103113539.5551-1-trond.myklebust@primarydata.com> <20171103113539.5551-2-trond.myklebust@primarydata.com> <20171103113539.5551-3-trond.myklebust@primarydata.com> <20171103113539.5551-4-trond.myklebust@primarydata.com> <20171103113539.5551-5-trond.myklebust@primarydata.com> <20171103113539.5551-6-trond.myklebust@primarydata.com> <20171103113539.5551-7-trond.myklebust@primarydata.com> <20171103113539.5551-8-trond.myklebust@primarydata.com> <20171103113539.5551-9-trond.myklebust@primarydata.com> <20171103113539.5551-10-trond.myklebust@primarydata.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-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Trond Myklebust --- fs/nfs/nfs4proc.c | 32 ++++++++++++++------------------ 1 file changed, 14 insertions(+), 18 deletions(-) diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c index 291fe9ca531e..a6b47feee552 100644 --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c @@ -5792,11 +5792,8 @@ static void nfs4_delegreturn_done(struct rpc_task *task, void *calldata) break; case -NFS4ERR_OLD_STATEID: if (nfs4_refresh_layout_stateid(&data->args.lr_args->stateid, - data->inode)) { - data->res.lr_ret = 0; - rpc_restart_call_prepare(task); - return; - } + data->inode)) + goto lr_restart; /* Fallthrough */ case -NFS4ERR_ADMIN_REVOKED: case -NFS4ERR_DELEG_REVOKED: @@ -5806,9 +5803,7 @@ static void nfs4_delegreturn_done(struct rpc_task *task, void *calldata) case -NFS4ERR_WRONG_CRED: data->args.lr_args = NULL; data->res.lr_res = NULL; - data->res.lr_ret = 0; - rpc_restart_call_prepare(task); - return; + goto lr_restart; } } @@ -5828,29 +5823,30 @@ static void nfs4_delegreturn_done(struct rpc_task *task, void *calldata) task->tk_status = 0; break; case -NFS4ERR_OLD_STATEID: - if (nfs4_refresh_delegation_stateid(&data->stateid, data->inode)) { - task->tk_status = 0; - rpc_restart_call_prepare(task); - return; - } + if (nfs4_refresh_delegation_stateid(&data->stateid, data->inode)) + goto out_restart; task->tk_status = 0; break; case -NFS4ERR_ACCESS: if (data->args.bitmask) { data->args.bitmask = NULL; data->res.fattr = NULL; - task->tk_status = 0; - rpc_restart_call_prepare(task); - return; + goto out_restart; } + /* Fallthrough */ default: if (nfs4_async_handle_error(task, data->res.server, NULL, NULL) == -EAGAIN) { - rpc_restart_call_prepare(task); - return; + goto out_restart; } } data->rpc_status = task->tk_status; + return; +lr_restart: + data->res.lr_ret = 0; +out_restart: + task->tk_status = 0; + rpc_restart_call_prepare(task); } static void nfs4_delegreturn_release(void *calldata)