nfs: Convert to use the preferred fallthrough macro
Subsystems (2)
PATCH 1/1 nfs: 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.
Signed-off-by Hongxiang Lou <[email protected]>
Signed-off-by Miaohe Lin <[email protected]>
--- fs/nfs/blocklayout/blocklayout.c | 2 +- fs/nfs/dir.c | 2 +- fs/nfs/filelayout/filelayout.c | 2 +- fs/nfs/flexfilelayout/flexfilelayout.c | 4 ++-- fs/nfs/fs_context.c | 22 ++++++++++-------- fs/nfs/nfs3acl.c | 4 ++-- fs/nfs/nfs4file.c | 2 +- fs/nfs/nfs4idmap.c | 4 ++-- fs/nfs/nfs4proc.c | 32 +++++++++++++------------- fs/nfs/nfs4state.c | 14 +++++------ fs/nfs/pagelist.c | 2 +- fs/nfs/pnfs.c | 2 +- fs/nfs/super.c | 2 +- 13 files changed, 48 insertions(+), 46 deletions(-)
fs/nfs/blocklayout/blocklayout.c +1 -1
@@ -753,7 +753,7 @@ bl_alloc_lseg(struct pnfs_layout_hdr *lo, struct nfs4_layoutget_res *lgr,case -ENODEV :/* Our extent block devices are unavailable */ set_bit (NFS_LSEG_UNAVAILABLE , &lseg->pls_flags); -/* Fall through */ + fallthrough;case 0 :return lseg;default :
fs/nfs/dir.c +1 -1
@@ -1181,7 +1181,7 @@ int nfs_lookup_verify_inode(struct inode *inode, unsigned int flags)/* A NFSv4 OPEN will revalidate later */ if (server->caps &NFS_CAP_ATOMIC_OPEN ) goto out; -/* Fallthrough */ + fallthrough;case S_IFDIR :if (server->flags &NFS_MOUNT_NOCTO )break ;
fs/nfs/filelayout/filelayout.c +1 -1
@@ -187,7 +187,7 @@ static int filelayout_async_handle_error(struct rpc_task *task,pnfs_error_mark_layout_for_return (inode, lseg);pnfs_set_lo_fail (lseg);rpc_wake_up (&tbl->slot_tbl_waitq); -/* fall through */ + fallthrough;default : reset: dprintk("%s Retry through MDS. Error %d\n", __func__,
fs/nfs/flexfilelayout/flexfilelayout.c +2 -2
@@ -1133,7 +1133,7 @@ static int ff_layout_async_handle_error_v4(struct rpc_task *task,nfs4_delete_deviceid (devid->ld, devid->nfs_client, &devid->deviceid);rpc_wake_up (&tbl->slot_tbl_waitq); -/* fall through */ + fallthrough;default :if (ff_layout_avoid_mds_available_ds (lseg))return -NFS4ERR_RESET_TO_PNFS ;
@@ -1260,7 +1260,7 @@ static void ff_layout_io_track_ds_error(struct pnfs_layout_segment *lseg,*/ if (opnum ==OP_READ )break ; -/* Fallthrough */ + fallthrough;default :pnfs_error_mark_layout_for_return (lseg->pls_layout->plh_inode, lseg);
fs/nfs/fs_context.c +12 -10
@@ -651,21 +651,21 @@ static int nfs_fs_context_parse_param(struct fs_context *fc,switch (lookup_constant (nfs_xprt_protocol_tokens, param->string,-1 )) {case Opt_xprt_udp6: protofamily =AF_INET6 ; -/* fall through */ + fallthrough;case Opt_xprt_udp: ctx->flags &= ~NFS_MOUNT_TCP ; ctx->nfs_server.protocol =XPRT_TRANSPORT_UDP ;break ;case Opt_xprt_tcp6: protofamily =AF_INET6 ; -/* fall through */ + fallthrough;case Opt_xprt_tcp: ctx->flags |=NFS_MOUNT_TCP ; ctx->nfs_server.protocol =XPRT_TRANSPORT_TCP ;break ;case Opt_xprt_rdma6: protofamily =AF_INET6 ; -/* fall through */ + fallthrough;case Opt_xprt_rdma:/* vector side protocols to TCP */ ctx->flags |=NFS_MOUNT_TCP ;
@@ -684,13 +684,13 @@ static int nfs_fs_context_parse_param(struct fs_context *fc,switch (lookup_constant (nfs_xprt_protocol_tokens, param->string,-1 )) {case Opt_xprt_udp6: mountfamily =AF_INET6 ; -/* fall through */ + fallthrough;case Opt_xprt_udp: ctx->mount_server.protocol =XPRT_TRANSPORT_UDP ;break ;case Opt_xprt_tcp6: mountfamily =AF_INET6 ; -/* fall through */ + fallthrough;case Opt_xprt_tcp: ctx->mount_server.protocol =XPRT_TRANSPORT_TCP ;break ;
@@ -899,9 +899,11 @@ static int nfs23_parse_monolithic(struct fs_context *fc, ctx->version =NFS_DEFAULT_VERSION ;switch (data->version) {case 1 : - data->namlen =0 ;/* fall through */ + data->namlen =0 ; + fallthrough;case 2 : - data->bsize =0 ;/* fall through */ + data->bsize =0 ; + fallthrough;case 3 :if (data->flags &NFS_MOUNT_VER3 ) goto out_no_v3;
@@ -909,14 +911,14 @@ static int nfs23_parse_monolithic(struct fs_context *fc,memcpy (data->root.data, data->old_root.data,NFS2_FHSIZE );/* Turn off security negotiation */ extra_flags |=NFS_MOUNT_SECFLAVOUR ; -/* fall through */ + fallthrough;case 4 :if (data->flags &NFS_MOUNT_SECFLAVOUR ) goto out_no_sec; -/* fall through */ + fallthrough;case 5 :memset (data->context,0 ,sizeof (data->context)); -/* fall through */ + fallthrough;case 6 :if (data->flags &NFS_MOUNT_VER3 ) {if (data->root.size >NFS3_FHSIZE || data->root.size ==0 )
fs/nfs/nfs3acl.c +2 -2
@@ -108,7 +108,7 @@ struct posix_acl *nfs3_get_acl(struct inode *inode, int type)case -EPROTONOSUPPORT :dprintk ("NFS_V3_ACL extension not supported; disabling\n" ); server->caps &= ~NFS_CAP_ACLS ; -/* fall through */ + fallthrough;case -ENOTSUPP : status = -EOPNOTSUPP ;default :
@@ -228,7 +228,7 @@ static int __nfs3_proc_setacls(struct inode *inode, struct posix_acl *acl,dprintk ("NFS_V3_ACL SETACL RPC not supported" "(will not retry)\n" ); server->caps &= ~NFS_CAP_ACLS ; -/* fall through */ + fallthrough;case -ENOTSUPP : status = -EOPNOTSUPP ; }
fs/nfs/nfs4file.c +1 -1
@@ -211,7 +211,7 @@ static loff_t nfs4_file_llseek(struct file *filep, loff_t offset, int whence) ret =nfs42_proc_llseek (filep, offset, whence);if (ret != -ENOTSUPP )return ret; -/* Fall through */ + fallthrough;default :return nfs_file_llseek (filep, offset, whence); }
fs/nfs/nfs4idmap.c +2 -2
@@ -520,7 +520,7 @@ static int nfs_idmap_prepare_message(char *desc, struct idmap *idmap,switch (token) {case Opt_find_uid: im->im_type =IDMAP_TYPE_USER ; -/* Fall through */ + fallthrough;case Opt_find_gid: im->im_conv =IDMAP_CONV_NAMETOID ; ret =match_strlcpy (im->im_name, &substr,IDMAP_NAMESZ );
@@ -528,7 +528,7 @@ static int nfs_idmap_prepare_message(char *desc, struct idmap *idmap,case Opt_find_user: im->im_type =IDMAP_TYPE_USER ; -/* Fall through */ + fallthrough;case Opt_find_group: im->im_conv =IDMAP_CONV_IDTONAME ; ret =match_int (&substr, &im->im_id);
fs/nfs/nfs4proc.c +16 -16
@@ -483,7 +483,7 @@ static int nfs4_do_handle_exception(struct nfs_server *server, stateid); goto wait_on_recovery; } -/* Fall through */ + fallthrough;case -NFS4ERR_OPENMODE :if (inode) {int err;
@@ -534,10 +534,10 @@ static int nfs4_do_handle_exception(struct nfs_server *server, ret = -EBUSY ;break ; } -/* Fall through */ + fallthrough;case -NFS4ERR_DELAY :nfs_inc_server_stats (server,NFSIOS_DELAY ); -/* Fall through */ + fallthrough;case -NFS4ERR_GRACE :case -NFS4ERR_LAYOUTTRYLATER :case -NFS4ERR_RECALLCONFLICT :
@@ -1505,7 +1505,7 @@ static int can_open_delegated(struct nfs_delegation *delegation, fmode_t fmode,case NFS4_OPEN_CLAIM_PREVIOUS :if (!test_bit (NFS_DELEGATION_NEED_RECLAIM , &delegation->flags))break ; -/* Fall through */ + fallthrough;default :return 0 ; }
@@ -2439,7 +2439,7 @@ static void nfs4_open_prepare(struct rpc_task *task, void *calldata)case NFS4_OPEN_CLAIM_DELEG_CUR_FH :case NFS4_OPEN_CLAIM_DELEG_PREV_FH : data->o_arg.open_bitmap = &nfs4_open_noattr_bitmap[0 ]; -/* Fall through */ + fallthrough;case NFS4_OPEN_CLAIM_FH : task->tk_msg.rpc_proc = &nfs4_procedures[NFSPROC4_CLNT_OPEN_NOATTR ]; }
@@ -3545,11 +3545,11 @@ static void nfs4_close_done(struct rpc_task *task, void *data)nfs4_free_revoked_stateid (server, &calldata->arg.stateid, task->tk_msg.rpc_cred); -/* Fallthrough */ + fallthrough;case -NFS4ERR_BAD_STATEID :if (calldata->arg.fmode ==0 )break ; -/* Fallthrough */ + fallthrough;default : task->tk_status =nfs4_async_handle_exception (task, server, task->tk_status, &exception);
@@ -6294,7 +6294,7 @@ static void nfs4_delegreturn_done(struct rpc_task *task, void *calldata)nfs4_free_revoked_stateid (data->res.server, data->args.stateid, task->tk_msg.rpc_cred); -/* Fallthrough */ + fallthrough;case -NFS4ERR_BAD_STATEID :case -NFS4ERR_STALE_STATEID :case -ETIMEDOUT :
@@ -6314,7 +6314,7 @@ static void nfs4_delegreturn_done(struct rpc_task *task, void *calldata) data->res.fattr =NULL ; goto out_restart; } -/* Fallthrough */ + fallthrough;default : task->tk_status = nfs4_async_handle_exception(task, data->res.server, task->tk_status,
@@ -6622,13 +6622,13 @@ static void nfs4_locku_done(struct rpc_task *task, void *data)if (nfs4_update_lock_stateid (calldata->lsp, &calldata->res.stateid))break ; -/* Fall through */ + fallthrough;case -NFS4ERR_ADMIN_REVOKED :case -NFS4ERR_EXPIRED :nfs4_free_revoked_stateid (calldata->server, &calldata->arg.stateid, task->tk_msg.rpc_cred); -/* Fall through */ + fallthrough;case -NFS4ERR_BAD_STATEID :case -NFS4ERR_STALE_STATEID : if (nfs4_sync_lock_stateid(&calldata->arg.stateid,
@@ -8665,7 +8665,7 @@ static void nfs4_get_lease_time_done(struct rpc_task *task, void *calldata)dprintk ("%s Retry: tk_status %d\n" , __func__, task->tk_status);rpc_delay (task,NFS4_POLL_RETRY_MIN ); task->tk_status =0 ; -/* fall through */ + fallthrough;case -NFS4ERR_RETRY_UNCACHED_REP :rpc_restart_call_prepare (task);return ;
@@ -9113,13 +9113,13 @@ static int nfs41_reclaim_complete_handle_errors(struct rpc_task *task, struct nfswitch (task->tk_status) {case 0 :wake_up_all (&clp->cl_lock_waitq); -/* Fallthrough */ + fallthrough;case -NFS4ERR_COMPLETE_ALREADY :case -NFS4ERR_WRONG_CRED :/* What to do here? */ break ;case -NFS4ERR_DELAY :rpc_delay (task,NFS4_POLL_RETRY_MAX ); -/* fall through */ + fallthrough;case -NFS4ERR_RETRY_UNCACHED_REP :return -EAGAIN ;case -NFS4ERR_BADSESSION :
@@ -9434,10 +9434,10 @@ static void nfs4_layoutreturn_done(struct rpc_task *task, void *calldata) &lrp->args.range, lrp->args.inode)) goto out_restart; -/* Fallthrough */ + fallthrough;default : task->tk_status =0 ; -/* Fallthrough */ + fallthrough;case 0 :break ;case -NFS4ERR_DELAY :
fs/nfs/nfs4state.c +7 -7
@@ -1530,7 +1530,7 @@ static int nfs4_reclaim_locks(struct nfs4_state *state, const struct nfs4_state_default :pr_err ("NFS: %s: unhandled error %d\n" , __func__, status); -/* Fall through */ + fallthrough;case -ENOMEM :case -NFS4ERR_DENIED :case -NFS4ERR_RECLAIM_BAD :
@@ -1667,7 +1667,7 @@ static int nfs4_reclaim_open_state(struct nfs4_state_owner *sp, const struct nfsbreak ; }printk (KERN_ERR "NFS: %s: unhandled error %d\n" , __func__, status); -/* Fall through */ + fallthrough;case -ENOENT :case -ENOMEM :case -EACCES :
@@ -1683,7 +1683,7 @@ static int nfs4_reclaim_open_state(struct nfs4_state_owner *sp, const struct nfsset_bit (ops->state_flag_bit, &state->flags);break ; } -/* Fall through */ + fallthrough;case -NFS4ERR_ADMIN_REVOKED :case -NFS4ERR_STALE_STATEID :case -NFS4ERR_OLD_STATEID :
@@ -1695,7 +1695,7 @@ static int nfs4_reclaim_open_state(struct nfs4_state_owner *sp, const struct nfscase -NFS4ERR_EXPIRED :case -NFS4ERR_NO_GRACE :nfs4_state_mark_reclaim_nograce (sp->so_server->nfs_client, state); -/* Fall through */ + fallthrough;case -NFS4ERR_STALE_CLIENTID :case -NFS4ERR_BADSESSION :case -NFS4ERR_BADSLOT :
@@ -2273,11 +2273,11 @@ int nfs4_discover_server_trunking(struct nfs_client *clp,case -ETIMEDOUT :if (clnt->cl_softrtry)break ; -/* Fall through */ + fallthrough;case -NFS4ERR_DELAY :case -EAGAIN :ssleep (1 ); -/* Fall through */ + fallthrough;case -NFS4ERR_STALE_CLIENTID :dprintk ("NFS: %s after status %d, retrying\n" , __func__, status);
@@ -2289,7 +2289,7 @@ int nfs4_discover_server_trunking(struct nfs_client *clp, }if (clnt->cl_auth->au_flavor ==RPC_AUTH_UNIX )break ; -/* Fall through */ + fallthrough;case -NFS4ERR_CLID_INUSE :case -NFS4ERR_WRONGSEC :/* No point in retrying if we already used RPC_AUTH_UNIX */
fs/nfs/pagelist.c +1 -1
@@ -711,7 +711,7 @@ static void nfs_pgio_rpcsetup(struct nfs_pgio_header *hdr,case FLUSH_COND_STABLE :if (nfs_reqs_to_commit (cinfo))break ; -/* fall through */ + fallthrough;default : hdr->args.stable =NFS_FILE_SYNC ; }
fs/nfs/pnfs.c +1 -1
@@ -1541,7 +1541,7 @@ void pnfs_roc_release(struct nfs4_layoutreturn_args *args,case 0 :if (res->lrs_present) res_stateid = &res->stateid; -/* Fallthrough */ + fallthrough;default : arg_stateid = &args->stateid; }
fs/nfs/super.c +1 -1
@@ -889,7 +889,7 @@ static struct nfs_server *nfs_try_mount_request(struct fs_context *fc)default :if (rpcauth_get_gssinfo (flavor, &info) !=0 )continue ; -/* Fallthrough */ + fallthrough; }dfprintk (MOUNT ,"NFS: attempting to use auth flavor %u\n" , flavor); ctx->selected_flavor = flavor;
Signature · 1 line
2.19.1