redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

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>
hifive-unleashed-5.1
Anna Schumaker 2017-01-11 16:08:35 -05:00
parent 820bf85ce2
commit 37a8484aef
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
fs/nfs/nfs4proc.c
View File

@ -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 *