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

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>

diff --git a/fs/nfs/nfs4state.c b/fs/nfs/nfs4state.c
index 8c7fe222f4c4289b6460fef8dd78c56c369a5560..cc27f11de2ecac8803737a51fa044ad27e3b48a8 100644 (file)
--- a/fs/nfs/nfs4state.c
+++ b/fs/nfs/nfs4state.c
@@ -1617,46 +1617,42 @@ restart:
                refcount_inc(&state->count);
                spin_unlock(&sp->so_lock);
                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) {
-                       default:
-                               printk(KERN_ERR "NFS: %s: unhandled error %d\n",
-                                       __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;
-                       case -EAGAIN:
-                               ssleep(1);
-                               /* Fall through */
-                       case -NFS4ERR_ADMIN_REVOKED:
-                       case -NFS4ERR_STALE_STATEID:
-                       case -NFS4ERR_OLD_STATEID:
-                       case -NFS4ERR_BAD_STATEID:
-                       case -NFS4ERR_RECLAIM_BAD:
-                       case -NFS4ERR_RECLAIM_CONFLICT:
-                               nfs4_state_mark_reclaim_nograce(sp->so_server->nfs_client, state);
+               default:
+                       if (status >= 0)
                                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;
+                       printk(KERN_ERR "NFS: %s: unhandled error %d\n", __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;
+               case -EAGAIN:
+                       ssleep(1);
+                       /* Fall through */
+               case -NFS4ERR_ADMIN_REVOKED:
+               case -NFS4ERR_STALE_STATEID:
+               case -NFS4ERR_OLD_STATEID:
+               case -NFS4ERR_BAD_STATEID:
+               case -NFS4ERR_RECLAIM_BAD:
+               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);
                spin_lock(&sp->so_lock);