View | Details | Raw Unified | Return to bug 260176
Collapse All | Expand All

(-)sys/fs/nfs/nfs_commonsubs.c (-12 / +6 lines)
Lines 1630-1637 nfsv4_loadattr(struct nfsrv_descript *nd, vnode_t vp, Link Here
1630
		case NFSATTRBIT_FILESAVAIL:
1630
		case NFSATTRBIT_FILESAVAIL:
1631
			NFSM_DISSECT(tl, u_int32_t *, NFSX_HYPER);
1631
			NFSM_DISSECT(tl, u_int32_t *, NFSX_HYPER);
1632
			if (compare) {
1632
			if (compare) {
1633
				if (!(*retcmpp) &&
1633
				if (!(*retcmpp))
1634
				    sfp->sf_afiles != fxdr_hyper(tl))
1635
					*retcmpp = NFSERR_NOTSAME;
1634
					*retcmpp = NFSERR_NOTSAME;
1636
			} else if (sfp != NULL) {
1635
			} else if (sfp != NULL) {
1637
				sfp->sf_afiles = fxdr_hyper(tl);
1636
				sfp->sf_afiles = fxdr_hyper(tl);
Lines 1641-1648 nfsv4_loadattr(struct nfsrv_descript *nd, vnode_t vp, Link Here
1641
		case NFSATTRBIT_FILESFREE:
1640
		case NFSATTRBIT_FILESFREE:
1642
			NFSM_DISSECT(tl, u_int32_t *, NFSX_HYPER);
1641
			NFSM_DISSECT(tl, u_int32_t *, NFSX_HYPER);
1643
			if (compare) {
1642
			if (compare) {
1644
				if (!(*retcmpp) &&
1643
				if (!(*retcmpp))
1645
				    sfp->sf_ffiles != fxdr_hyper(tl))
1646
					*retcmpp = NFSERR_NOTSAME;
1644
					*retcmpp = NFSERR_NOTSAME;
1647
			} else if (sfp != NULL) {
1645
			} else if (sfp != NULL) {
1648
				sfp->sf_ffiles = fxdr_hyper(tl);
1646
				sfp->sf_ffiles = fxdr_hyper(tl);
Lines 1652-1659 nfsv4_loadattr(struct nfsrv_descript *nd, vnode_t vp, Link Here
1652
		case NFSATTRBIT_FILESTOTAL:
1650
		case NFSATTRBIT_FILESTOTAL:
1653
			NFSM_DISSECT(tl, u_int32_t *, NFSX_HYPER);
1651
			NFSM_DISSECT(tl, u_int32_t *, NFSX_HYPER);
1654
			if (compare) {
1652
			if (compare) {
1655
				if (!(*retcmpp) &&
1653
				if (!(*retcmpp))
1656
				    sfp->sf_tfiles != fxdr_hyper(tl))
1657
					*retcmpp = NFSERR_NOTSAME;
1654
					*retcmpp = NFSERR_NOTSAME;
1658
			} else if (sfp != NULL) {
1655
			} else if (sfp != NULL) {
1659
				sfp->sf_tfiles = fxdr_hyper(tl);
1656
				sfp->sf_tfiles = fxdr_hyper(tl);
Lines 2003-2010 nfsv4_loadattr(struct nfsrv_descript *nd, vnode_t vp, Link Here
2003
		case NFSATTRBIT_SPACEAVAIL:
2000
		case NFSATTRBIT_SPACEAVAIL:
2004
			NFSM_DISSECT(tl, u_int32_t *, NFSX_HYPER);
2001
			NFSM_DISSECT(tl, u_int32_t *, NFSX_HYPER);
2005
			if (compare) {
2002
			if (compare) {
2006
				if (!(*retcmpp) &&
2003
				if (!(*retcmpp))
2007
				    sfp->sf_abytes != fxdr_hyper(tl))
2008
					*retcmpp = NFSERR_NOTSAME;
2004
					*retcmpp = NFSERR_NOTSAME;
2009
			} else if (sfp != NULL) {
2005
			} else if (sfp != NULL) {
2010
				sfp->sf_abytes = fxdr_hyper(tl);
2006
				sfp->sf_abytes = fxdr_hyper(tl);
Lines 2014-2021 nfsv4_loadattr(struct nfsrv_descript *nd, vnode_t vp, Link Here
2014
		case NFSATTRBIT_SPACEFREE:
2010
		case NFSATTRBIT_SPACEFREE:
2015
			NFSM_DISSECT(tl, u_int32_t *, NFSX_HYPER);
2011
			NFSM_DISSECT(tl, u_int32_t *, NFSX_HYPER);
2016
			if (compare) {
2012
			if (compare) {
2017
				if (!(*retcmpp) &&
2013
				if (!(*retcmpp))
2018
				    sfp->sf_fbytes != fxdr_hyper(tl))
2019
					*retcmpp = NFSERR_NOTSAME;
2014
					*retcmpp = NFSERR_NOTSAME;
2020
			} else if (sfp != NULL) {
2015
			} else if (sfp != NULL) {
2021
				sfp->sf_fbytes = fxdr_hyper(tl);
2016
				sfp->sf_fbytes = fxdr_hyper(tl);
Lines 2025-2032 nfsv4_loadattr(struct nfsrv_descript *nd, vnode_t vp, Link Here
2025
		case NFSATTRBIT_SPACETOTAL:
2020
		case NFSATTRBIT_SPACETOTAL:
2026
			NFSM_DISSECT(tl, u_int32_t *, NFSX_HYPER);
2021
			NFSM_DISSECT(tl, u_int32_t *, NFSX_HYPER);
2027
			if (compare) {
2022
			if (compare) {
2028
				if (!(*retcmpp) &&
2023
				if (!(*retcmpp))
2029
				    sfp->sf_tbytes != fxdr_hyper(tl))
2030
					*retcmpp = NFSERR_NOTSAME;
2024
					*retcmpp = NFSERR_NOTSAME;
2031
			} else if (sfp != NULL) {
2025
			} else if (sfp != NULL) {
2032
				sfp->sf_tbytes = fxdr_hyper(tl);
2026
				sfp->sf_tbytes = fxdr_hyper(tl);

Return to bug 260176