d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nfsd: Fix build after commit 103b207536 for 32bit arches

Browse Source 
MFC after:	2 weeks
This commit is contained in:
Rick Macklem 2021-09-08 18:55:06 -07:00
parent d06d7eb091
commit f1c8811d2d
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sys/fs/nfsserver/nfs_nfsdserv.c
View File

@ -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)