diff options
| author | Anna Schumaker | 2017-01-11 22:13:29 +0100 |
|---|---|---|
| committer | Anna Schumaker | 2017-01-30 19:14:50 +0100 |
| commit | d7e9825848cede4cf7589b63029b76428ae76958 (patch) | |
| tree | 78815207809147725df1e2737e9165ad0ffec393 | |
| parent | NFS: Return errors directly in _nfs4_opendata_reclaim_to_nfs4_state() (diff) | |
| download | kernel-qcow2-linux-d7e9825848cede4cf7589b63029b76428ae76958.tar.gz kernel-qcow2-linux-d7e9825848cede4cf7589b63029b76428ae76958.tar.xz kernel-qcow2-linux-d7e9825848cede4cf7589b63029b76428ae76958.zip | |
NFS: Remove an extra if in _nfs4_recover_proc_open()
It's simpler just to return the status unconditionally
Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
| -rw-r--r-- | fs/nfs/nfs4proc.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c index 3e892b05e62b..031b867aaefa 100644 --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c @@ -2216,11 +2216,8 @@ static int _nfs4_recover_proc_open(struct nfs4_opendata *data) nfs_fattr_map_and_free_names(NFS_SERVER(dir), &data->f_attr); - if (o_res->rflags & NFS4_OPEN_RESULT_CONFIRM) { + if (o_res->rflags & NFS4_OPEN_RESULT_CONFIRM) status = _nfs4_proc_open_confirm(data); - if (status != 0) - return status; - } return status; } |