]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
NFS: Remove an extra if in _nfs4_recover_proc_open()
authorAnna Schumaker <Anna.Schumaker@Netapp.com>
Wed, 11 Jan 2017 21:13:29 +0000 (16:13 -0500)
committerAnna Schumaker <Anna.Schumaker@Netapp.com>
Mon, 30 Jan 2017 18:14:50 +0000 (13:14 -0500)
It's simpler just to return the status unconditionally

Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
fs/nfs/nfs4proc.c

index 3e892b05e62b6c46c664b4d3d02b83902ea0de4e..031b867aaefa878201f3ce96bfe5ac13c3359dea 100644 (file)
@@ -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;
 }