From: Chuck Lever <chuck.lever@oracle.com>
Date: Mon, 15 May 2023 13:35:44 +0000 (-0400)
Subject: NFSD: Clean up nfsctl_transaction_write()
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=3434d7aa77d24c5c4b3d4385084cfdb607f05dec;p=linux.git

NFSD: Clean up nfsctl_transaction_write()

For easier readability, follow the common convention:

    if (error)
	handle_error;
    continue_normally;

No behavior change is expected.

Reviewed-by: Jeff Layton <jlayton@kernel.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
---

diff --git a/fs/nfsd/nfsctl.c b/fs/nfsd/nfsctl.c
index 2ecea3b318ebd..df0aae211a497 100644
--- a/fs/nfsd/nfsctl.c
+++ b/fs/nfsd/nfsctl.c
@@ -109,12 +109,12 @@ static ssize_t nfsctl_transaction_write(struct file *file, const char __user *bu
 	if (IS_ERR(data))
 		return PTR_ERR(data);
 
-	rv =  write_op[ino](file, data, size);
-	if (rv >= 0) {
-		simple_transaction_set(file, rv);
-		rv = size;
-	}
-	return rv;
+	rv = write_op[ino](file, data, size);
+	if (rv < 0)
+		return rv;
+
+	simple_transaction_set(file, rv);
+	return size;
 }
 
 static ssize_t nfsctl_transaction_read(struct file *file, char __user *buf, size_t size, loff_t *pos)