nfsd: Convert to use the preferred fallthrough macro
Subsystems (2)
PATCH v2 1/1 nfsd: Convert to use the preferred fallthrough macro
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.
--- 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(-)
fs/nfsd/nfs4callback.c +1 -1
@@ -1119,7 +1119,7 @@ static bool nfsd4_cb_sequence_done(struct rpc_task *task, struct nfsd4_callbackbreak ;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);
fs/nfsd/nfs4proc.c +1 -1
@@ -428,7 +428,7 @@ nfsd4_open(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, goto out; open->op_openowner->oo_flags |=NFS4_OO_CONFIRMED ; reclaim = true; -/* fall through */ + fallthrough;case NFS4_OPEN_CLAIM_FH :case NFS4_OPEN_CLAIM_DELEG_CUR_FH : status =do_open_fhandle (rqstp, cstate, open);
fs/nfsd/nfs4state.c +1 -1
@@ -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 = nfserr_encr_alg_unsupp; goto out_nolock;
fs/nfsd/nfsfh.c +1 -1
@@ -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 !=NULL ;
fs/nfsd/vfs.c +2 -2
@@ -1456,7 +1456,7 @@ do_nfsd_create(struct svc_rqst *rqstp, struct svc_fh *fhp, *created = true;break ; } -/* fall through */ + fallthrough;case NFS4_CREATE_EXCLUSIVE4_1 :if (d_inode (dchild)->i_mtime.tv_sec == v_mtime && d_inode(dchild)->i_atime.tv_sec == v_atime
@@ -1465,7 +1465,7 @@ do_nfsd_create(struct svc_rqst *rqstp, struct svc_fh *fhp, *created = true; goto set_attr; } -/* fall through */ + fallthrough;case NFS3_CREATE_GUARDED : err = nfserr_exist; }
Signature · 1 line
2.19.1
Hi-
Quoted 8 lines · Miaohe Lin
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.Signed-off-by Hongxiang Lou <[email protected]>Signed-off-by Miaohe Lin <[email protected]>
LGTM. If he also approves, I assume Bruce is taking this one for v5.10.
Quoted 85 lines
---
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(-)fs/nfsd/nfs4callback.c +1
-1@@ -1119,7 +1119,7 @@ static bool nfsd4_cb_sequence_done(struct rpc_task *task, struct nfsd4_callbackbreak ;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);fs/nfsd/nfs4proc.c +1
-1@@ -428,7 +428,7 @@ nfsd4_open(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, goto out; open->op_openowner->oo_flags |=NFS4_OO_CONFIRMED ; reclaim = true; -/* fall through */ + fallthrough;case NFS4_OPEN_CLAIM_FH :case NFS4_OPEN_CLAIM_DELEG_CUR_FH : status =do_open_fhandle (rqstp, cstate, open);fs/nfsd/nfs4state.c +1
-1@@ -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 = nfserr_encr_alg_unsupp; goto out_nolock;fs/nfsd/nfsfh.c +1
-1@@ -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 !=NULL ;fs/nfsd/vfs.c +2
-2@@ -1456,7 +1456,7 @@ do_nfsd_create(struct svc_rqst *rqstp, struct svc_fh *fhp, *created = true;break ; } -/* fall through */ + fallthrough;case NFS4_CREATE_EXCLUSIVE4_1 :if (d_inode (dchild)->i_mtime.tv_sec == v_mtime && d_inode(dchild)->i_atime.tv_sec == v_atime@@ -1465,7 +1465,7 @@ do_nfsd_create(struct svc_rqst *rqstp, struct svc_fh *fhp, *created = true; goto set_attr; } -/* fall through */ + fallthrough;case NFS3_CREATE_GUARDED : err = nfserr_exist; }Signature · 1 line
2.19.1
--
Chuck Lever
Quoted 4 lines · Chuck Lever
Hi-
Quoted 2 lines · Miaohe Lin
Quoted 8 lines
Quoted 6 lines
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.Signed-off-by Hongxiang Lou <[email protected]>Signed-off-by Miaohe Lin <[email protected]>LGTM. If he also approves, I assume Bruce is taking this one for v5.10.
Yep, applying, thanks.--b.