Received-SPF: pass (google.com: domain of linux-nfs-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Content-Type: text/plain;
        charset=us-ascii
Mime-Version: 1.0 (Mac OS X Mail 13.4 \(3608.120.23.2.1\))
Subject: Re: [PATCH v2] nfsd: Convert to use the preferred fallthrough macro
From:   Chuck Lever <chuck.lever@oracle.com>
In-Reply-To: <20200820025718.51244-1-linmiaohe@huawei.com>
Date:   Thu, 20 Aug 2020 08:49:12 -0400
Cc:     Linux NFS Mailing List <linux-nfs@vger.kernel.org>,
        open list <linux-kernel@vger.kernel.org>
Content-Transfer-Encoding: quoted-printable
Message-Id: <01498CCA-B21A-4E8D-9761-41610C54CB9A@oracle.com>
References: <20200820025718.51244-1-linmiaohe@huawei.com>
To:     Miaohe Lin <linmiaohe@huawei.com>,
        Bruce Fields <bfields@fieldses.org>
Sender: linux-nfs-owner@vger.kernel.org
Precedence: bulk

Hi-

> On Aug 19, 2020, at 10:57 PM, Miaohe Lin <linmiaohe@huawei.com> wrote:
>=20
> Convert the uses of fallthrough comments to fallthrough macro. Please =
see
> commit 294f69e662d1 ("compiler_attributes.h: Add 'fallthrough' pseudo
> keyword for switch/case use") for detail.
>=20
> Signed-off-by: Hongxiang Lou <louhongxiang@huawei.com>
> Signed-off-by: Miaohe Lin <linmiaohe@huawei.com>

LGTM. If he also approves, I assume Bruce is taking this one for v5.10.


> ---
> fs/nfsd/nfs4callback.c | 2 +-
> fs/nfsd/nfs4proc.c     | 2 +-
> fs/nfsd/nfs4state.c    | 2 +-
> fs/nfsd/nfsfh.c        | 2 +-
> fs/nfsd/vfs.c          | 4 ++--
> 5 files changed, 6 insertions(+), 6 deletions(-)
>=20
> diff --git a/fs/nfsd/nfs4callback.c b/fs/nfsd/nfs4callback.c
> index 7fbe9840a03e..052be5bf9ef5 100644
> --- a/fs/nfsd/nfs4callback.c
> +++ b/fs/nfsd/nfs4callback.c
> @@ -1119,7 +1119,7 @@ static bool nfsd4_cb_sequence_done(struct =
rpc_task *task, struct nfsd4_callback
> 		break;
> 	case -ESERVERFAULT:
> 		++session->se_cb_seq_nr;
> -		/* Fall through */
> +		fallthrough;
> 	case 1:
> 	case -NFS4ERR_BADSESSION:
> 		nfsd4_mark_cb_fault(cb->cb_clp, cb->cb_seq_status);
> diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c
> index a527da3d8052..eaf50eafa935 100644
> --- a/fs/nfsd/nfs4proc.c
> +++ b/fs/nfsd/nfs4proc.c
> @@ -428,7 +428,7 @@ nfsd4_open(struct svc_rqst *rqstp, struct =
nfsd4_compound_state *cstate,
> 				goto out;
> 			open->op_openowner->oo_flags |=3D =
NFS4_OO_CONFIRMED;
> 			reclaim =3D true;
> -			/* fall through */
> +			fallthrough;
> 		case NFS4_OPEN_CLAIM_FH:
> 		case NFS4_OPEN_CLAIM_DELEG_CUR_FH:
> 			status =3D do_open_fhandle(rqstp, cstate, open);
> diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
> index 81ed8e8bab3f..2f77f4b66cbc 100644
> --- a/fs/nfsd/nfs4state.c
> +++ b/fs/nfsd/nfs4state.c
> @@ -3117,7 +3117,7 @@ nfsd4_exchange_id(struct svc_rqst *rqstp, struct =
nfsd4_compound_state *cstate,
> 		break;
> 	default:				/* checked by xdr code =
*/
> 		WARN_ON_ONCE(1);
> -		/* fall through */
> +		fallthrough;
> 	case SP4_SSV:
> 		status =3D nfserr_encr_alg_unsupp;
> 		goto out_nolock;
> diff --git a/fs/nfsd/nfsfh.c b/fs/nfsd/nfsfh.c
> index 37bc8f5f4514..a0a8d27539ae 100644
> --- a/fs/nfsd/nfsfh.c
> +++ b/fs/nfsd/nfsfh.c
> @@ -469,7 +469,7 @@ static bool fsid_type_ok_for_exp(u8 fsid_type, =
struct svc_export *exp)
> 	case FSID_UUID16:
> 		if (!is_root_export(exp))
> 			return false;
> -		/* fall through */
> +		fallthrough;
> 	case FSID_UUID4_INUM:
> 	case FSID_UUID16_INUM:
> 		return exp->ex_uuid !=3D NULL;
> diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c
> index 7d2933b85b65..aba5af9df328 100644
> --- a/fs/nfsd/vfs.c
> +++ b/fs/nfsd/vfs.c
> @@ -1456,7 +1456,7 @@ do_nfsd_create(struct svc_rqst *rqstp, struct =
svc_fh *fhp,
> 					*created =3D true;
> 				break;
> 			}
> -			/* fall through */
> +			fallthrough;
> 		case NFS4_CREATE_EXCLUSIVE4_1:
> 			if (   d_inode(dchild)->i_mtime.tv_sec =3D=3D =
v_mtime
> 			    && d_inode(dchild)->i_atime.tv_sec =3D=3D =
v_atime
> @@ -1465,7 +1465,7 @@ do_nfsd_create(struct svc_rqst *rqstp, struct =
svc_fh *fhp,
> 					*created =3D true;
> 				goto set_attr;
> 			}
> -			/* fall through */
> +			fallthrough;
> 		case NFS3_CREATE_GUARDED:
> 			err =3D nfserr_exist;
> 		}
> --=20
> 2.19.1
>=20

--
Chuck Lever