Attachment 9164 Details for Bug 18874 – nfs.diff

[patch] nfs.diff

nfs.diff (text/plain), 1.34 KB, created by Tim Robbins on 2003-12-29 11:29:31 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tim Robbins

Created: 2003-12-29 11:29:31 UTC

Size: 1.34 KB

patch

obsolete

>==== //depot/user/tjr/freebsd-tjr/src/sys/nfsserver/nfs_serv.c#6 - /p4/src/sys/nfsserver/nfs_serv.c ====
>@@ -3779,7 +3779,6 @@
> 	nfsfh_t nfh;
> 	fhandle_t *fhp;
> 	struct statfs statfs;
>-	u_quad_t tval;
> 
> 	nfsdbprintf(("%s %d\n", __FILE__, __LINE__));
> 	fhp = &nfh.fh_generic;
>@@ -3806,21 +3805,12 @@
> 	}
> 	sfp = nfsm_build(struct nfs_statfs *, NFSX_STATFS(v3));
> 	if (v3) {
>-		tval = (u_quad_t)sf->f_blocks;
>-		tval *= (u_quad_t)sf->f_bsize;
>-		txdr_hyper(tval, &sfp->sf_tbytes);
>-		tval = (u_quad_t)sf->f_bfree;
>-		tval *= (u_quad_t)sf->f_bsize;
>-		txdr_hyper(tval, &sfp->sf_fbytes);
>-		tval = (u_quad_t)sf->f_bavail;
>-		tval *= (u_quad_t)sf->f_bsize;
>-		txdr_hyper(tval, &sfp->sf_abytes);
>-		sfp->sf_tfiles.nfsuquad[0] = 0;
>-		sfp->sf_tfiles.nfsuquad[1] = txdr_unsigned(sf->f_files);
>-		sfp->sf_ffiles.nfsuquad[0] = 0;
>-		sfp->sf_ffiles.nfsuquad[1] = txdr_unsigned(sf->f_ffree);
>-		sfp->sf_afiles.nfsuquad[0] = 0;
>-		sfp->sf_afiles.nfsuquad[1] = txdr_unsigned(sf->f_ffree);
>+		txdr_hyper(sf->f_blocks * sf->f_bsize, &sfp->sf_tbytes);
>+		txdr_hyper(sf->f_bfree * sf->f_bsize, &sfp->sf_fbytes);
>+		txdr_hyper(sf->f_bavail * sf->f_bsize, &sfp->sf_abytes);
>+		txdr_hyper(sf->f_files, &sfp->sf_tfiles);
>+		txdr_hyper(sf->f_ffree, &sfp->sf_ffiles);
>+		txdr_hyper(sf->f_ffree, &sfp->sf_afiles);
> 		sfp->sf_invarsec = 0;
> 	} else {
> 		sfp->sf_tsize = txdr_unsigned(NFS_MAXDGRAMDATA);

Actions: View | Diff

Attachments on bug 18874: 9164