nfsrv_create: fix an LP64 problem for exclusive create.

This commit is contained in:
yamt 2004-05-31 08:47:08 +00:00
parent 347bbb94d3
commit 7407c491c3
1 changed files with 18 additions and 7 deletions

View File

@ -1,4 +1,4 @@
/* $NetBSD: nfs_serv.c,v 1.88 2004/04/21 01:05:42 christos Exp $ */
/* $NetBSD: nfs_serv.c,v 1.89 2004/05/31 08:47:08 yamt Exp $ */
/*
* Copyright (c) 1989, 1993
@ -55,7 +55,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: nfs_serv.c,v 1.88 2004/04/21 01:05:42 christos Exp $");
__KERNEL_RCSID(0, "$NetBSD: nfs_serv.c,v 1.89 2004/05/31 08:47:08 yamt Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -1477,8 +1477,12 @@ nfsrv_create(nfsd, slp, procp, mrq)
if (exclusive_flag) {
exclusive_flag = 0;
VATTR_NULL(&va);
memcpy((caddr_t)&va.va_atime, cverf,
NFSX_V3CREATEVERF);
/*
* XXX
* assuming NFSX_V3CREATEVERF
* == sizeof(nfstime3)
*/
fxdr_nfsv3time(cverf, &va.va_atime);
error = VOP_SETATTR(nd.ni_vp, &va, cred,
procp);
}
@ -1546,9 +1550,16 @@ nfsrv_create(nfsd, slp, procp, mrq)
vput(vp);
}
if (v3) {
if (exclusive_flag && !error &&
memcmp(cverf, (caddr_t)&va.va_atime, NFSX_V3CREATEVERF))
error = EEXIST;
if (exclusive_flag && !error) {
/*
* XXX assuming NFSX_V3CREATEVERF == sizeof(nfstime3)
*/
char oldverf[NFSX_V3CREATEVERF];
txdr_nfsv3time(&va.va_atime, oldverf);
if (memcmp(cverf, oldverf, NFSX_V3CREATEVERF))
error = EEXIST;
}
diraft_ret = VOP_GETATTR(dirp, &diraft, cred, procp);
vrele(dirp);
}