AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2025-04-05 06:27:57 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

NFS: Reduce indentation of the switch statement in nfs4_reclaim_open_state()

Browse Source 
Most places in the kernel tend to line up cases with the switch to
reduce indentation, so move this over to match that style.
Additionally, I handle the (status >= 0) case in the switch so that we
only "goto restart" from a single place after error handling.

Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
This commit is contained in:
Anna Schumaker 2018-09-11 16:23:47 -04:00 committed by Trond Myklebust
parent cb7a8384dc
commit 35a61606a6
1 changed files with 33 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
fs/nfs/nfs4state.c
View File

@ -1617,46 +1617,42 @@ static int nfs4_reclaim_open_state(struct nfs4_state_owner *sp, const struct nfs
refcount_inc(&state->count); refcount_inc(&state->count);
spin_unlock(&sp->so_lock); spin_unlock(&sp->so_lock);
status = __nfs4_reclaim_open_state(sp, state, ops); status = __nfs4_reclaim_open_state(sp, state, ops);
if (status >= 0) {
nfs4_put_open_state(state);
spin_lock(&sp->so_lock);
goto restart;
}
switch (status) { switch (status) {
default: default:
printk(KERN_ERR "NFS: %s: unhandled error %d\n", if (status >= 0)
__func__, status);
/* Fall through */
case -ENOENT:
case -ENOMEM:
case -EACCES:
case -EROFS:
case -EIO:
case -ESTALE:
/* Open state on this file cannot be recovered */
nfs4_state_mark_recovery_failed(state, status);
break; break;
case -EAGAIN: printk(KERN_ERR "NFS: %s: unhandled error %d\n", __func__, status);
ssleep(1); /* Fall through */
/* Fall through */ case -ENOENT:
case -NFS4ERR_ADMIN_REVOKED: case -ENOMEM:
case -NFS4ERR_STALE_STATEID: case -EACCES:
case -NFS4ERR_OLD_STATEID: case -EROFS:
case -NFS4ERR_BAD_STATEID: case -EIO:
case -NFS4ERR_RECLAIM_BAD: case -ESTALE:
case -NFS4ERR_RECLAIM_CONFLICT: /* Open state on this file cannot be recovered */
nfs4_state_mark_reclaim_nograce(sp->so_server->nfs_client, state); nfs4_state_mark_recovery_failed(state, status);
break; break;
case -NFS4ERR_EXPIRED: case -EAGAIN:
case -NFS4ERR_NO_GRACE: ssleep(1);
nfs4_state_mark_reclaim_nograce(sp->so_server->nfs_client, state); /* Fall through */
case -NFS4ERR_STALE_CLIENTID: case -NFS4ERR_ADMIN_REVOKED:
case -NFS4ERR_BADSESSION: case -NFS4ERR_STALE_STATEID:
case -NFS4ERR_BADSLOT: case -NFS4ERR_OLD_STATEID:
case -NFS4ERR_BAD_HIGH_SLOT: case -NFS4ERR_BAD_STATEID:
case -NFS4ERR_CONN_NOT_BOUND_TO_SESSION: case -NFS4ERR_RECLAIM_BAD:
goto out_err; case -NFS4ERR_RECLAIM_CONFLICT:
nfs4_state_mark_reclaim_nograce(sp->so_server->nfs_client, state);
break;
case -NFS4ERR_EXPIRED:
case -NFS4ERR_NO_GRACE:
nfs4_state_mark_reclaim_nograce(sp->so_server->nfs_client, state);
case -NFS4ERR_STALE_CLIENTID:
case -NFS4ERR_BADSESSION:
case -NFS4ERR_BADSLOT:
case -NFS4ERR_BAD_HIGH_SLOT:
case -NFS4ERR_CONN_NOT_BOUND_TO_SESSION:
goto out_err;
} }
nfs4_put_open_state(state); nfs4_put_open_state(state);
spin_lock(&sp->so_lock); spin_lock(&sp->so_lock);