NFS: Return errors directly in _nfs4_opendata_reclaim_to_nfs4_state()

There is no need for a goto just to return an error code without any
cleanup.  Returning the error directly helps to clean up the code.

Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>

diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index b577e172c95b35bbc1f6d63d92a2735ba0aaa0d0..3e892b05e62b6c46c664b4d3d02b83902ea0de4e 100644 (file)
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -1639,17 +1639,15 @@ _nfs4_opendata_reclaim_to_nfs4_state(struct nfs4_opendata *data)
        int ret;
 
        if (!data->rpc_done) {
-               if (data->rpc_status) {
-                       ret = data->rpc_status;
-                       goto err;
-               }
+               if (data->rpc_status)
+                       return ERR_PTR(data->rpc_status);
                /* cached opens have already been processed */
                goto update;
        }
 
        ret = nfs_refresh_inode(inode, &data->f_attr);
        if (ret)
-               goto err;
+               return ERR_PTR(ret);
 
        if (data->o_res.delegation_type != 0)
                nfs4_opendata_check_deleg(data, state);
@@ -1659,9 +1657,6 @@ update:
        atomic_inc(&state->count);
 
        return state;
-err:
-       return ERR_PTR(ret);
-
 }
 
 static struct nfs4_state *