Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

as we now have 64bit ino_t, no need to truncate nfsv3 fileids.

This commit is contained in:
yamt 2005-08-19 12:47:23 +00:00
parent d0fa934dc3
commit b247716cf3
2 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sys/nfs/nfs_serv.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: nfs_serv.c,v 1.95 2005/05/18 12:57:34 yamt Exp $ */
/* $NetBSD: nfs_serv.c,v 1.96 2005/08/19 12:47:23 yamt Exp $ */
/*
* Copyright (c) 1989, 1993
@ -55,7 +55,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: nfs_serv.c,v 1.95 2005/05/18 12:57:34 yamt Exp $");
__KERNEL_RCSID(0, "$NetBSD: nfs_serv.c,v 1.96 2005/08/19 12:47:23 yamt Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -2766,7 +2766,7 @@ again:
bp += NFSX_UNSIGNED;
if (v3) {
nfsm_clget;
*tl = 0;
*tl = txdr_unsigned(dp->d_fileno >> 32);
bp += NFSX_UNSIGNED;
}
nfsm_clget;
@ -3068,7 +3068,7 @@ again:
*tl = nfs_true;
bp += NFSX_UNSIGNED;
nfsm_clget;
*tl = 0;
*tl = txdr_unsigned(dp->d_fileno >> 32);
bp += NFSX_UNSIGNED;
nfsm_clget;
*tl = txdr_unsigned(dp->d_fileno);

10
sys/nfs/nfs_subs.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: nfs_subs.c,v 1.150 2005/07/07 02:05:03 christos Exp $ */
/* $NetBSD: nfs_subs.c,v 1.151 2005/08/19 12:47:23 yamt Exp $ */
/*
* Copyright (c) 1989, 1993
@ -70,7 +70,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: nfs_subs.c,v 1.150 2005/07/07 02:05:03 christos Exp $");
__KERNEL_RCSID(0, "$NetBSD: nfs_subs.c,v 1.151 2005/08/19 12:47:23 yamt Exp $");
#include "fs_nfs.h"
#include "opt_nfs.h"
@ -1800,8 +1800,7 @@ nfs_loadattrcache(vpp, fp, vaper, flags)
vap->va_gid = gid;
vap->va_size = fxdr_hyper(&fp->fa3_size);
vap->va_bytes = fxdr_hyper(&fp->fa3_used);
vap->va_fileid = fxdr_unsigned(int32_t,
fp->fa3_fileid.nfsuquad[1]);
vap->va_fileid = fxdr_hyper(&fp->fa3_fileid);
fxdr_nfsv3time(&fp->fa3_atime, &vap->va_atime);
vap->va_flags = 0;
vap->va_filerev = 0;
@ -2488,8 +2487,7 @@ nfsm_srvfattr(nfsd, vap, fp)
fp->fa3_rdev.specdata2 = txdr_unsigned(minor(vap->va_rdev));
fp->fa3_fsid.nfsuquad[0] = 0;
fp->fa3_fsid.nfsuquad[1] = txdr_unsigned(vap->va_fsid);
fp->fa3_fileid.nfsuquad[0] = 0;
fp->fa3_fileid.nfsuquad[1] = txdr_unsigned(vap->va_fileid);
txdr_hyper(vap->va_fileid, &fp->fa3_fileid);
txdr_nfsv3time(&vap->va_atime, &fp->fa3_atime);
txdr_nfsv3time(&vap->va_mtime, &fp->fa3_mtime);
txdr_nfsv3time(&vap->va_ctime, &fp->fa3_ctime);