From patchwork Fri Nov 3 11:35:38 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trond Myklebust X-Patchwork-Id: 10039841 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 4D2A86032D for ; Fri, 3 Nov 2017 11:36:11 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4ABBE295B1 for ; Fri, 3 Nov 2017 11:36:11 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3DC64295B8; Fri, 3 Nov 2017 11:36:11 +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 D3833295B1 for ; Fri, 3 Nov 2017 11:36:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756094AbdKCLgH (ORCPT ); Fri, 3 Nov 2017 07:36:07 -0400 Received: from mail-io0-f193.google.com ([209.85.223.193]:46734 "EHLO mail-io0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756092AbdKCLgG (ORCPT ); Fri, 3 Nov 2017 07:36:06 -0400 Received: by mail-io0-f193.google.com with SMTP id 101so5587749ioj.3 for ; Fri, 03 Nov 2017 04:36:05 -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=2Q3A2cCXPoGmR3rFuBNyOMZKmdD80Nk8i35LMo1jjiI=; b=innGeWdOzucRXdyoDUvPMZOK72DPSjRWUbz3Eb+RTisN5zDTPZtDpiNatgYhGuIQH8 cTaonKQXUf6hW68loN3FSZ4rOcfv47PJpV+MmGFYwK/hD+bQLq+OBgEWvrGH1TJ0MN06 SzuBlzR2JZDyI5I3/2LeDzYwon7TMFUOenwF+M1D2AXoaOqwnBPkIRaRDcz5YFOdKXcZ P14gseaFNhQu1buj8FbuHafmGv18B82yL0Acg2oCTJSVeEdBdOKYfEUX8VYcoTOFFR62 NQfzICdw+eQSh1SV7Mo20xd07mhgy7y/mAj4BwPuSPMO92YkE1uf3LIfcir1eVGofZ7X wmMQ== 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=2Q3A2cCXPoGmR3rFuBNyOMZKmdD80Nk8i35LMo1jjiI=; b=DsSlOJGYjRPjCpKbkK6WtwrTO3OQrXhQqJqVhPbVWNS8UQaxur8H3MXQNSTgcyFZWN vIHUQWoRjLv8qV6G8lK/BuUMbE0mGj2OuNDBxrvNhBy76XyBO47u0ZuFG57XBN1miJoj bK38s2UTPNavBnq+ZKz04NvIe9+gZZo6+UZTAz6r3UXVQRcPmwxjPSm1MtSr5YWs56aS tF1anOSbbvBQrtSouKvfSqsNzQsbKg91pwh8lZbow+ag0iW3hdbHyKZI6lAuO0Kuhyt+ E+z+kyrcGNCslrprVj6roicKbZidUm1lif/f8zuVg/G/YhAA/wzDYRrcwuKOinBOYK3R jpWg== X-Gm-Message-State: AMCzsaWg8Z11x9hRv0Kbh3in/MGnXskmw0FW2SZDlyWVBA9AJ+qrVRMO PJML7J/5eFseFzHl7fuoyg== X-Google-Smtp-Source: ABhQp+S/vS2VU1lhM735xAric0jZoqJzZpoBKOl40FEJLHjSkDkQHDmagU8dP2MLRnfhNlDKx6Coyw== X-Received: by 10.107.173.160 with SMTP id m32mr8790549ioo.200.1509708965274; Fri, 03 Nov 2017 04:36:05 -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.04 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 03 Nov 2017 04:36:04 -0700 (PDT) From: Trond Myklebust To: Benjamin Coddington , Anna Schumaker Cc: linux-nfs@vger.kernel.org Subject: [PATCH v5 09/10] NFSv4: cleanup nfs4_close_done Date: Fri, 3 Nov 2017 07:35:38 -0400 Message-Id: <20171103113539.5551-10-trond.myklebust@primarydata.com> X-Mailer: git-send-email 2.13.6 In-Reply-To: <20171103113539.5551-9-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> 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 | 34 +++++++++++++++------------------- 1 file changed, 15 insertions(+), 19 deletions(-) diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c index 79306a903453..291fe9ca531e 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,10 +3214,8 @@ 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); @@ -3234,6 +3223,13 @@ static void nfs4_close_done(struct rpc_task *task, void *data) 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)