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

Set np->n_size before calling nfs_vinvalbuf, to avoid recursion 

and confusion about the actual filesize. From Matt Dillon's
similar change in FreeBSD.

XXX n_size is really redundant in -current and must die. This commit
XXX is more of a placeholder for a pullup into the 1.5 branch.
This commit is contained in:
fvdl 2001-12-15 00:32:49 +00:00
parent c6df7d4358
commit e3e7b4bd55
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sys/nfs/nfs_vnops.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: nfs_vnops.c,v 1.147 2001/12/08 04:10:00 lukem Exp $ */ /* $NetBSD: nfs_vnops.c,v 1.148 2001/12/15 00:32:49 fvdl Exp $ */
/* /*
* Copyright (c) 1989, 1993 * Copyright (c) 1989, 1993
@ -43,7 +43,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: nfs_vnops.c,v 1.147 2001/12/08 04:10:00 lukem Exp $"); __KERNEL_RCSID(0, "$NetBSD: nfs_vnops.c,v 1.148 2001/12/15 00:32:49 fvdl Exp $");
#include "opt_nfs.h" #include "opt_nfs.h"
#include "opt_uvmhist.h" #include "opt_uvmhist.h"
@ -694,6 +694,8 @@ nfs_setattr(v)
if (vp->v_mount->mnt_flag & MNT_RDONLY) if (vp->v_mount->mnt_flag & MNT_RDONLY)
return (EROFS); return (EROFS);
uvm_vnp_setsize(vp, vap->va_size); uvm_vnp_setsize(vp, vap->va_size);
tsize = np->n_size;
np->n_size = vap->va_size;
if (vap->va_size == 0) if (vap->va_size == 0)
error = nfs_vinvalbuf(vp, 0, error = nfs_vinvalbuf(vp, 0,
ap->a_cred, ap->a_p, 1); ap->a_cred, ap->a_p, 1);
@ -701,11 +703,10 @@ nfs_setattr(v)
error = nfs_vinvalbuf(vp, V_SAVE, error = nfs_vinvalbuf(vp, V_SAVE,
ap->a_cred, ap->a_p, 1); ap->a_cred, ap->a_p, 1);
if (error) { if (error) {
uvm_vnp_setsize(vp, np->n_size); uvm_vnp_setsize(vp, tsize);
return (error); return (error);
} }
tsize = np->n_size; np->n_vattr->va_size = vap->va_size;
np->n_size = np->n_vattr->va_size = vap->va_size;
} }
} else if ((vap->va_mtime.tv_sec != VNOVAL || } else if ((vap->va_mtime.tv_sec != VNOVAL ||
vap->va_atime.tv_sec != VNOVAL) && vap->va_atime.tv_sec != VNOVAL) &&