Received-SPF: pass (google.com: domain of linux-nfs+bounces-3604-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223;
From: Mike Snitzer <snitzer@kernel.org>
To: linux-nfs@vger.kernel.org
Cc: Jeff Layton <jlayton@kernel.org>,
	Chuck Lever <chuck.lever@oracle.com>,
	Trond Myklebust <trondmy@hammerspace.com>,
	snitzer@hammerspace.com
Subject: [for-6.11 PATCH 19/29] nfs/write: fix nfs_initiate_commit to return error from nfs_local_commit
Date: Fri,  7 Jun 2024 10:26:36 -0400
Message-ID: <20240607142646.20924-20-snitzer@kernel.org>
In-Reply-To: <20240607142646.20924-1-snitzer@kernel.org>
References: <20240607142646.20924-1-snitzer@kernel.org>
Precedence: bulk
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit

status was established in nfs_initiate_commit when nfs_local_commit
was introduced, but it was never actually used to return any error
from nfs_local_commit.

Signed-off-by: Mike Snitzer <snitzer@kernel.org>
---
 fs/nfs/write.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fs/nfs/write.c b/fs/nfs/write.c
index 79375af3f2a6..7deda7e90d22 100644
--- a/fs/nfs/write.c
+++ b/fs/nfs/write.c
@@ -1704,7 +1704,7 @@ int nfs_initiate_commit(struct nfs_client *clp,
 	dprintk("NFS: initiated commit call\n");
 
 	if (localio) {
-		nfs_local_commit(clp, localio, data, call_ops, how);
+		status = nfs_local_commit(clp, localio, data, call_ops, how);
 		goto out;
 	}
 
-- 
2.44.0