From patchwork Mon Nov 6 15:27:25 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trond Myklebust X-Patchwork-Id: 10043713 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 E69C660247 for ; Mon, 6 Nov 2017 15:27:51 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CF63F29EA6 for ; Mon, 6 Nov 2017 15:27:51 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C429E29E9F; Mon, 6 Nov 2017 15:27:51 +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.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,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 604D029EA5 for ; Mon, 6 Nov 2017 15:27:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932196AbdKFP1u (ORCPT ); Mon, 6 Nov 2017 10:27:50 -0500 Received: from mail-io0-f194.google.com ([209.85.223.194]:46848 "EHLO mail-io0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932155AbdKFP1t (ORCPT ); Mon, 6 Nov 2017 10:27:49 -0500 Received: by mail-io0-f194.google.com with SMTP id 101so16069751ioj.3 for ; Mon, 06 Nov 2017 07:27:49 -0800 (PST) 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=ow+pr09lerSSGJr81coaJI5s8FfBokAsYzw/PmOq/DM=; b=MMP1Gsf38jnJqwHGbv8t8FgIpbi35VNCVm21sw2uIJSUqxbgflPHAIonBI6vcQXUu7 L2a9JQwvEn7La5dMfsvbvI+AOTaOkNiqKg/wdrwb9Vf5AwSz/ZlVil7fm4dyruaOD8S9 9/RPgp+9dODhTgb15dk+XaeO3qYBQ19vznrA381G0b1ntXlxFfINcC+NeEiiR0x9iaB2 5mjCtkXlmOj/NfpD7mGT4nwlIwKejAfFxSybdwTLdRPG+y3Y6qZGpg27INFT2zKFKebR WzrcaZ+Ve1fhkiuyaeDVyePdGubEaOqmxK1U0HUbkxWjRlJ3CgXuCz8cL1/RR7jnwI91 SDqw== 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=ow+pr09lerSSGJr81coaJI5s8FfBokAsYzw/PmOq/DM=; b=sgD6iN2uueJr0IpgMcaj3lOrgTkAmDf1GzooKZ/JnbWEKcGRm0kbOA74x1fmXWz3+C IL8CxIpuSC0k8kJsTQFj6bDpnd2UoDZLzc/hLA6uskwqfgS3I86dtIeqvZnU7IDP9xyR /CUeRCx+IFjq+qYPsqmLhsIQKtXbCyxovIshubp8c5opSJazg/R9eo5ZwfPOIM7C8b6w JOZOH+WAqh/BxGt6weg3NizpwSkimzh51tiO57nqFE0j08fx8EYQLEDWIpvYSLlYjOMB HzbAnMvJP8WXz1e7Q5F8ZIOR9gO6Sd3oeJEYYG/XGIqxyAAP7ZzbywQGpWBl3/CFE0Mq jesA== X-Gm-Message-State: AJaThX5LltzpQlN1nlEnZ0pqBNmxdXDmStVuu9c73UDJDP8yheGRbbFH RmqBHowl13UM+EI0MBhq/A== X-Google-Smtp-Source: ABhQp+Q5gpvyiTIBq1jKYLE6qm2q7wm753LBzQJf72Jn3fd2cqaNYy4MjqT8hoiXqksGWOCN32gqow== X-Received: by 10.107.133.85 with SMTP id h82mr19727562iod.208.1509982069004; Mon, 06 Nov 2017 07:27:49 -0800 (PST) Received: from localhost.localdomain (c-68-49-162-121.hsd1.mi.comcast.net. [68.49.162.121]) by smtp.gmail.com with ESMTPSA id p10sm5807007ioe.19.2017.11.06.07.27.47 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 06 Nov 2017 07:27:48 -0800 (PST) From: Trond Myklebust To: Benjamin Coddington , Anna Schumaker Cc: linux-nfs@vger.kernel.org Subject: [PATCH v7 09/10] NFSv4: cleanup nfs4_close_done Date: Mon, 6 Nov 2017 10:27:25 -0500 Message-Id: <20171106152726.13755-10-trond.myklebust@primarydata.com> X-Mailer: git-send-email 2.13.6 In-Reply-To: <20171106152726.13755-9-trond.myklebust@primarydata.com> References: <20171106152726.13755-1-trond.myklebust@primarydata.com> <20171106152726.13755-2-trond.myklebust@primarydata.com> <20171106152726.13755-3-trond.myklebust@primarydata.com> <20171106152726.13755-4-trond.myklebust@primarydata.com> <20171106152726.13755-5-trond.myklebust@primarydata.com> <20171106152726.13755-6-trond.myklebust@primarydata.com> <20171106152726.13755-7-trond.myklebust@primarydata.com> <20171106152726.13755-8-trond.myklebust@primarydata.com> <20171106152726.13755-9-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 | 35 ++++++++++++++++------------------- 1 file changed, 16 insertions(+), 19 deletions(-) diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c index f11230db8d25..ec62d8ad64ed 100644 --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c @@ -3167,11 +3167,8 @@ static void nfs4_close_done(struct rpc_task *task, void *data) break; case -NFS4ERR_OLD_STATEID: if (nfs4_refresh_layout_stateid(&calldata->arg.lr_args->stateid, - calldata->inode)) { - calldata->res.lr_ret = 0; - rpc_restart_call_prepare(task); - return; - } + calldata->inode)) + goto lr_restart; /* Fallthrough */ case -NFS4ERR_ADMIN_REVOKED: case -NFS4ERR_DELEG_REVOKED: @@ -3181,9 +3178,7 @@ static void nfs4_close_done(struct rpc_task *task, void *data) case -NFS4ERR_WRONG_CRED: calldata->arg.lr_args = NULL; calldata->res.lr_res = NULL; - calldata->res.lr_ret = 0; - rpc_restart_call_prepare(task); - return; + goto lr_restart; } } @@ -3199,19 +3194,15 @@ static void nfs4_close_done(struct rpc_task *task, void *data) if (calldata->arg.bitmask != NULL) { calldata->arg.bitmask = NULL; calldata->res.fattr = NULL; - task->tk_status = 0; - rpc_restart_call_prepare(task); - goto out_release; + goto out_restart; } break; case -NFS4ERR_OLD_STATEID: /* Did we race with OPEN? */ if (nfs4_refresh_open_stateid(&calldata->arg.stateid, - state)) { - task->tk_status = 0; - rpc_restart_call_prepare(task); - } + state)) + goto out_restart; goto out_release; case -NFS4ERR_ADMIN_REVOKED: case -NFS4ERR_STALE_STATEID: @@ -3223,17 +3214,23 @@ static void nfs4_close_done(struct rpc_task *task, void *data) case -NFS4ERR_BAD_STATEID: break; default: - if (nfs4_async_handle_error(task, server, state, NULL) == -EAGAIN) { - rpc_restart_call_prepare(task); - goto out_release; - } + if (nfs4_async_handle_error(task, server, state, NULL) == -EAGAIN) + goto out_restart; } nfs_clear_open_stateid(state, &calldata->arg.stateid, res_stateid, calldata->arg.fmode); out_release: + task->tk_status = 0; nfs_release_seqid(calldata->arg.seqid); nfs_refresh_inode(calldata->inode, &calldata->fattr); dprintk("%s: done, ret = %d!\n", __func__, task->tk_status); + return; +lr_restart: + calldata->res.lr_ret = 0; +out_restart: + task->tk_status = 0; + rpc_restart_call_prepare(task); + goto out_release; } static void nfs4_close_prepare(struct rpc_task *task, void *data)