Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 37a8484a authored by Anna Schumaker's avatar Anna Schumaker
Browse files

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: default avatarAnna Schumaker <Anna.Schumaker@Netapp.com>
parent 820bf85c

fs/nfs/nfs4proc.c

+3 −8
Original line number Diff line number Diff line
@@ -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 @@ _nfs4_opendata_reclaim_to_nfs4_state(struct nfs4_opendata *data) 
	atomic_inc(&state->count);



	return state;

err:

	return ERR_PTR(ret);



}



static struct nfs4_state *