From patchwork Tue Sep 11 20:23:48 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anna Schumaker X-Patchwork-Id: 10596269 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id B4CB914E5 for ; Tue, 11 Sep 2018 20:23:55 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A0F9329A2B for ; Tue, 11 Sep 2018 20:23:55 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 952FA29E2B; Tue, 11 Sep 2018 20:23:55 +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=-7.8 required=2.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,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 3DE3F29A2B for ; Tue, 11 Sep 2018 20:23:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726800AbeILBYv (ORCPT ); Tue, 11 Sep 2018 21:24:51 -0400 Received: from mail-qk1-f195.google.com ([209.85.222.195]:33402 "EHLO mail-qk1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726762AbeILBYv (ORCPT ); Tue, 11 Sep 2018 21:24:51 -0400 Received: by mail-qk1-f195.google.com with SMTP id z78-v6so17657278qka.0 for ; Tue, 11 Sep 2018 13:23:53 -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=BbutqalbrSUslZ4SCgz6ul+fmJEYXURg00NFXbyqR2E=; b=VoX+UTbhiiMet7lp3SQz5KSEQn6GOFCZcfAR4AQRPLHBncKe5xmPSvBbv8r9xvz2r0 7SnP+m0Gkc3gCID/ZKB6NvDjivaUyUlxHfgM+clpm46jwO5T9Ex2/qjMA4Fj2rjdxGzH vPJE4YbQAEYMgF5UH62yzqAqd+FV5ZbAXB3K95kUcPs+9siz5WEdhwDpCD6XL6ck/Fvi VUEnvt9USHrBDc6SD4KKNYpG+/d+4j+p8wCDwY9roaj11aogpO+/R+kLOdtfrLycaRfe OY2zTbbOXErtiintMC49vIr1u8qFIxh7+EgUuct6lsPLGlGqhYk8CRHfTVKf+lCWSdtQ joKw== 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=BbutqalbrSUslZ4SCgz6ul+fmJEYXURg00NFXbyqR2E=; b=EmtgaLS8KHph/SlocYasVqQFDu/MSMx21ykoGwAbp/mk6fH6M/P2ceGtL/mLFOxhdO 9tvaklvgMl1TDVjUlIqZYGhzJ25mgNMAh0Vpv5+BOQA7U2lTKKAW0A5I1Sl+iS8BF2K2 WvyCVeO0CAb2pyQWXLOMWMtviwQZX6ZsAko3NTGibZM+GQWR0R49vWtdesfn8FvuD+6x 9PVHzc4VswOz/S1nBzjCV83C2C+4uTiyHZTq//IMHVmbDawy8nVRbLUNBgXwnMWgH8g3 WxkuSJUlk7wTfvcPTbWplrF4WANYKnwQUvv46Lzlo9GhpyRKCXoERpw3EQB4QiNieHzX +75g== X-Gm-Message-State: APzg51Aro29LceOcos8aVwxkEAUVNZTP/b8G9xq4bNji7bN0RRG1dXf+ DcnMdo/Svnmkv2vkQ6ToedD9l13o15c= X-Google-Smtp-Source: ANB0VdbA5UAd+22wV84M0SWOPPvw1GBiCX1UPm/Ma6sKTQu50R2FZ60XJredkQcz+zU8aDrDRvuFAg== X-Received: by 2002:a37:83c6:: with SMTP id f189-v6mr20635463qkd.47.1536697433186; Tue, 11 Sep 2018 13:23:53 -0700 (PDT) Received: from gouda.nowheycreamery.com.local (c-68-40-188-1.hsd1.mi.comcast.net. [68.40.188.1]) by smtp.gmail.com with ESMTPSA id u129-v6sm11015517qkd.45.2018.09.11.13.23.52 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 11 Sep 2018 13:23:52 -0700 (PDT) From: schumaker.anna@gmail.com X-Google-Original-From: Anna.Schumaker@Netapp.com To: Trond.Myklebust@hammerspace.com, linux-nfs@vger.kernel.org Subject: [PATCH 3/3] NFS: Reduce indentation of nfs4_recovery_handle_error() Date: Tue, 11 Sep 2018 16:23:48 -0400 Message-Id: <20180911202348.23160-3-Anna.Schumaker@Netapp.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180911202348.23160-1-Anna.Schumaker@Netapp.com> References: <20180911202348.23160-1-Anna.Schumaker@Netapp.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 From: Anna Schumaker This is to match kernel coding style for switch statements. Signed-off-by: Anna Schumaker --- fs/nfs/nfs4state.c | 64 +++++++++++++++++++++++----------------------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/fs/nfs/nfs4state.c b/fs/nfs/nfs4state.c index 8a399dc17e19..816f526bbcb3 100644 --- a/fs/nfs/nfs4state.c +++ b/fs/nfs/nfs4state.c @@ -1800,38 +1800,38 @@ static void nfs4_state_start_reclaim_nograce(struct nfs_client *clp) static int nfs4_recovery_handle_error(struct nfs_client *clp, int error) { switch (error) { - case 0: - break; - case -NFS4ERR_CB_PATH_DOWN: - nfs40_handle_cb_pathdown(clp); - break; - case -NFS4ERR_NO_GRACE: - nfs4_state_end_reclaim_reboot(clp); - break; - case -NFS4ERR_STALE_CLIENTID: - set_bit(NFS4CLNT_LEASE_EXPIRED, &clp->cl_state); - nfs4_state_start_reclaim_reboot(clp); - break; - case -NFS4ERR_EXPIRED: - set_bit(NFS4CLNT_LEASE_EXPIRED, &clp->cl_state); - nfs4_state_start_reclaim_nograce(clp); - break; - case -NFS4ERR_BADSESSION: - case -NFS4ERR_BADSLOT: - case -NFS4ERR_BAD_HIGH_SLOT: - case -NFS4ERR_DEADSESSION: - case -NFS4ERR_SEQ_FALSE_RETRY: - case -NFS4ERR_SEQ_MISORDERED: - set_bit(NFS4CLNT_SESSION_RESET, &clp->cl_state); - /* Zero session reset errors */ - break; - case -NFS4ERR_CONN_NOT_BOUND_TO_SESSION: - set_bit(NFS4CLNT_BIND_CONN_TO_SESSION, &clp->cl_state); - break; - default: - dprintk("%s: failed to handle error %d for server %s\n", - __func__, error, clp->cl_hostname); - return error; + case 0: + break; + case -NFS4ERR_CB_PATH_DOWN: + nfs40_handle_cb_pathdown(clp); + break; + case -NFS4ERR_NO_GRACE: + nfs4_state_end_reclaim_reboot(clp); + break; + case -NFS4ERR_STALE_CLIENTID: + set_bit(NFS4CLNT_LEASE_EXPIRED, &clp->cl_state); + nfs4_state_start_reclaim_reboot(clp); + break; + case -NFS4ERR_EXPIRED: + set_bit(NFS4CLNT_LEASE_EXPIRED, &clp->cl_state); + nfs4_state_start_reclaim_nograce(clp); + break; + case -NFS4ERR_BADSESSION: + case -NFS4ERR_BADSLOT: + case -NFS4ERR_BAD_HIGH_SLOT: + case -NFS4ERR_DEADSESSION: + case -NFS4ERR_SEQ_FALSE_RETRY: + case -NFS4ERR_SEQ_MISORDERED: + set_bit(NFS4CLNT_SESSION_RESET, &clp->cl_state); + /* Zero session reset errors */ + break; + case -NFS4ERR_CONN_NOT_BOUND_TO_SESSION: + set_bit(NFS4CLNT_BIND_CONN_TO_SESSION, &clp->cl_state); + break; + default: + dprintk("%s: failed to handle error %d for server %s\n", + __func__, error, clp->cl_hostname); + return error; } dprintk("%s: handled error %d for server %s\n", __func__, error, clp->cl_hostname);