git: f1c8811d2d25 - main - nfsd: Fix build after commit 103b207536f9 for 32bit arches

[Rick Macklem]

The branch main has been updated by rmacklem:

URL: https://cgit.FreeBSD.org/src/commit/?id=f1c8811d2d250aac5a59bb2109d905139c119925

commit f1c8811d2d250aac5a59bb2109d905139c119925
Author:     Rick Macklem <rmacklem at FreeBSD.org>
AuthorDate: 2021-09-09 01:55:06 +0000
Commit:     Rick Macklem <rmacklem at FreeBSD.org>
CommitDate: 2021-09-09 01:55:06 +0000

    nfsd: Fix build after commit 103b207536f9 for 32bit arches
    
    MFC after:      2 weeks
---
 sys/fs/nfsserver/nfs_nfsdserv.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/sys/fs/nfsserver/nfs_nfsdserv.c b/sys/fs/nfsserver/nfs_nfsdserv.c
index d82057fb9d9e..85834f7796f7 100644
--- a/sys/fs/nfsserver/nfs_nfsdserv.c
+++ b/sys/fs/nfsserver/nfs_nfsdserv.c
@@ -5505,6 +5505,7 @@ nfsrvd_copy_file_range(struct nfsrv_descript *nd, __unused int isdgram,
 	int cnt, error = 0, ret;
 	off_t inoff, outoff;
 	uint64_t len;
+	size_t xfer;
 	struct nfsstate inst, outst, *instp = &inst, *outstp = &outst;
 	struct nfslock inlo, outlo, *inlop = &inlo, *outlop = &outlo;
 	nfsquad_t clientid;
@@ -5679,10 +5680,14 @@ nfsrvd_copy_file_range(struct nfsrv_descript *nd, __unused int isdgram,
 			nd->nd_repstat = error;
 	}
 
-	if (nd->nd_repstat == 0)
+	xfer = len;
+	if (nd->nd_repstat == 0) {
 		nd->nd_repstat = vn_copy_file_range(vp, &inoff, tovp, &outoff,
-		    &len, COPY_FILE_RANGE_TIMEO1SEC, nd->nd_cred, nd->nd_cred,
+		    &xfer, COPY_FILE_RANGE_TIMEO1SEC, nd->nd_cred, nd->nd_cred,
 		    NULL);
+		if (nd->nd_repstat == 0)
+			len = xfer;
+	}
 
 	/* Unlock the ranges. */
 	if (rl_rcookie != NULL)