From: Anna Schumaker <Anna.Schumaker@Netapp.com>
Date: Wed, 11 Jan 2017 21:13:29 +0000 (-0500)
Subject: NFS: Remove an extra if in _nfs4_recover_proc_open()
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=d7e9825848cede4cf7589b63029b76428ae76958;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git

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

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;
 }