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

Fix the new NFS client so that it handles the 64bit fields

Browse Source 
that are now in "struct statfs" for NFSv3 and NFSv4. Since
the ffiles value is uint64_t on the wire, I clip the value
to INT64_MAX to avoid setting f_ffree negative.

Tested by:	kib
MFC after:	2 weeks
This commit is contained in:
Rick Macklem 2011-05-05 00:11:09 +00:00
parent cf6ba592c5
commit f96712c2e6
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=221467
1 changed files with 23 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
sys/fs/nfsclient/nfs_clport.c
View File

@ -838,21 +838,33 @@ void
nfscl_loadsbinfo(struct nfsmount *nmp, struct nfsstatfs *sfp, void *statfs) nfscl_loadsbinfo(struct nfsmount *nmp, struct nfsstatfs *sfp, void *statfs)
{ {
struct statfs *sbp = (struct statfs *)statfs; struct statfs *sbp = (struct statfs *)statfs;
nfsquad_t tquad;
if (nmp->nm_flag & (NFSMNT_NFSV3 | NFSMNT_NFSV4)) { if (nmp->nm_flag & (NFSMNT_NFSV3 | NFSMNT_NFSV4)) {
sbp->f_bsize = NFS_FABLKSIZE; sbp->f_bsize = NFS_FABLKSIZE;
tquad.qval = sfp->sf_tbytes; sbp->f_blocks = sfp->sf_tbytes / NFS_FABLKSIZE;
sbp->f_blocks = (long)(tquad.qval / ((u_quad_t)NFS_FABLKSIZE)); sbp->f_bfree = sfp->sf_fbytes / NFS_FABLKSIZE;
tquad.qval = sfp->sf_fbytes; /*
sbp->f_bfree = (long)(tquad.qval / ((u_quad_t)NFS_FABLKSIZE)); * Although sf_abytes is uint64_t and f_bavail is int64_t,
tquad.qval = sfp->sf_abytes; * the value after dividing by NFS_FABLKSIZE is small
sbp->f_bavail = (long)(tquad.qval / ((u_quad_t)NFS_FABLKSIZE)); * enough that it will fit in 63bits, so it is ok to
tquad.qval = sfp->sf_tfiles; * assign it to f_bavail without fear that it will become
sbp->f_files = (tquad.lval[0] & 0x7fffffff); * negative.
tquad.qval = sfp->sf_ffiles; */
sbp->f_ffree = (tquad.lval[0] & 0x7fffffff); sbp->f_bavail = sfp->sf_abytes / NFS_FABLKSIZE;
sbp->f_files = sfp->sf_tfiles;
/* Since f_ffree is int64_t, clip it to 63bits. */
if (sfp->sf_ffiles > INT64_MAX)
sbp->f_ffree = INT64_MAX;
else
sbp->f_ffree = sfp->sf_ffiles;
} else if ((nmp->nm_flag & NFSMNT_NFSV4) == 0) { } else if ((nmp->nm_flag & NFSMNT_NFSV4) == 0) {
/*
* The type casts to (int32_t) ensure that this code is
* compatible with the old NFS client, in that it will
* propagate bit31 to the high order bits. This may or may
* not be correct for NFSv2, but since it is a legacy
* environment, I'd rather retain backwards compatibility.
*/
sbp->f_bsize = (int32_t)sfp->sf_bsize; sbp->f_bsize = (int32_t)sfp->sf_bsize;
sbp->f_blocks = (int32_t)sfp->sf_blocks; sbp->f_blocks = (int32_t)sfp->sf_blocks;
sbp->f_bfree = (int32_t)sfp->sf_bfree; sbp->f_bfree = (int32_t)sfp->sf_bfree;