NFSv4: Clean up encode_nfs4_stateid()

Trond Myklebust · amschuma-ntap · commit 5d2db0898a56 · 2024-07-08T13:47:26.000-04:00
Ensure that we encode the actual stateid, and not any metadata.

Signed-off-by: Trond Myklebust &lt;trond.myklebust@hammerspace.com&gt;
Reviewed-by: Jeff Layton &lt;jlayton@kernel.org&gt;
Signed-off-by: Anna Schumaker &lt;Anna.Schumaker@Netapp.com&gt;
diff --git a/fs/nfs/nfs4xdr.c b/fs/nfs/nfs4xdr.c
@@ -1067,9 +1067,10 @@ static void encode_nops(struct compound_hdr *hdr)
 	*hdr->nops_p = htonl(hdr->nops);
 }
 
-static void encode_nfs4_stateid(struct xdr_stream *xdr, const nfs4_stateid *stateid)
+static void encode_nfs4_stateid(struct xdr_stream *xdr,
+				const nfs4_stateid *stateid)
 {
-	encode_opaque_fixed(xdr, stateid, NFS4_STATEID_SIZE);
+	encode_opaque_fixed(xdr, stateid->data, NFS4_STATEID_SIZE);
 }
 
 static void encode_nfs4_verifier(struct xdr_stream *xdr, const nfs4_verifier *verf)

Original file line number	Diff line number	Diff line change
`@@ -1067,9 +1067,10 @@ static void encode_nops(struct compound_hdr *hdr)`
`1067`	`1067`	`*hdr->nops_p = htonl(hdr->nops);`
`1068`	`1068`	`}`
`1069`	`1069`
`1070`		`-static void encode_nfs4_stateid(struct xdr_stream xdr, const nfs4_stateid stateid)`
	`1070`	`+static void encode_nfs4_stateid(struct xdr_stream *xdr,`
	`1071`	`+ const nfs4_stateid *stateid)`
`1071`	`1072`	`{`
`1072`		`- encode_opaque_fixed(xdr, stateid, NFS4_STATEID_SIZE);`
	`1073`	`+ encode_opaque_fixed(xdr, stateid->data, NFS4_STATEID_SIZE);`
`1073`	`1074`	`}`
`1074`	`1075`
`1075`	`1076`	`static void encode_nfs4_verifier(struct xdr_stream xdr, const nfs4_verifier verf)`