From: Jonathan Curley <jcurley@purestorage.com>
Date: Wed, 24 Sep 2025 16:20:43 +0000 (+0000)
Subject: NFSv4/flexfiles: Use ds_commit_idx when marking a write commit
X-Git-Tag: v6.18-rc1~109^2~16
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=eb71428e1a7fb51b8d43762db1c2ec1d8a7a95b6;p=thirdparty%2Fkernel%2Flinux.git

NFSv4/flexfiles: Use ds_commit_idx when marking a write commit

Correct this path to use ds_commit_idx. Another noop preparation
change. In current code commit_idx == mirror_idx but when striping is
enabled that will not be true.

Signed-off-by: Jonathan Curley <jcurley@purestorage.com>
Signed-off-by: Anna Schumaker <anna.schumaker@oracle.com>
---

diff --git a/fs/nfs/write.c b/fs/nfs/write.c
index ad588ed59c09b..0fb6905736d51 100644
--- a/fs/nfs/write.c
+++ b/fs/nfs/write.c
@@ -931,7 +931,7 @@ static void nfs_write_completion(struct nfs_pgio_header *hdr)
 			req->wb_nio = 0;
 			memcpy(&req->wb_verf, &hdr->verf.verifier, sizeof(req->wb_verf));
 			nfs_mark_request_commit(req, hdr->lseg, &cinfo,
-				hdr->pgio_mirror_idx);
+				hdr->ds_commit_idx);
 			goto next;
 		}
 remove_req: