Date: Sat, 25 Sep 2021 20:45:42 GMT From: Rick Macklem <rmacklem@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: f72cdea25c29 - stable/13 - nfsd: Fix build after commit 103b207536f9 for 32bit arches Message-ID: <202109252045.18PKjgZ2080853@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch stable/13 has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=f72cdea25c291a88d1793e88202a847e7a62f74b commit f72cdea25c291a88d1793e88202a847e7a62f74b Author: Rick Macklem <rmacklem@FreeBSD.org> AuthorDate: 2021-09-09 01:55:06 +0000 Commit: Rick Macklem <rmacklem@FreeBSD.org> CommitDate: 2021-09-25 20:42:26 +0000 nfsd: Fix build after commit 103b207536f9 for 32bit arches (cherry picked from commit f1c8811d2d250aac5a59bb2109d905139c119925) --- 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 9bfa6dd3a99b..33af169f4e98 100644 --- a/sys/fs/nfsserver/nfs_nfsdserv.c +++ b/sys/fs/nfsserver/nfs_nfsdserv.c @@ -5400,6 +5400,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; @@ -5574,10 +5575,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)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202109252045.18PKjgZ2080853>