summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorAnna Schumaker <Anna.Schumaker@Netapp.com>2017-01-11 22:13:29 +0100
committerAnna Schumaker <Anna.Schumaker@Netapp.com>2017-01-30 19:14:50 +0100
commitd7e9825848cede4cf7589b63029b76428ae76958 (patch)
tree78815207809147725df1e2737e9165ad0ffec393 /fs
parentNFS: Return errors directly in _nfs4_opendata_reclaim_to_nfs4_state() (diff)
downloadlinux-d7e9825848cede4cf7589b63029b76428ae76958.tar.xz
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>
Diffstat (limited to 'fs')
-rw-r--r--fs/nfs/nfs4proc.c5
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;
}