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

Set union vnode size when creating a vnode.

Browse Source 
fixes kern/36679 by Geoff C. Wing
This commit is contained in:
pooka 2007-07-23 08:21:50 +00:00
parent 83f023eb3d
commit ae519de8f0
1 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
sys/fs/union/union_subr.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: union_subr.c,v 1.25 2007/04/07 15:08:12 hannken Exp $ */
/* $NetBSD: union_subr.c,v 1.26 2007/07/23 08:21:50 pooka Exp $ */
/*
* Copyright (c) 1994
@ -72,7 +72,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: union_subr.c,v 1.25 2007/04/07 15:08:12 hannken Exp $");
__KERNEL_RCSID(0, "$NetBSD: union_subr.c,v 1.26 2007/07/23 08:21:50 pooka Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -267,8 +267,10 @@ union_newsize(vp, uppersz, lowersz)
off_t sz;
/* only interested in regular files */
if (vp->v_type != VREG)
if (vp->v_type != VREG) {
uvm_vnp_setsize(vp, 0);
return;
}
un = VTOUNION(vp);
sz = VNOVAL;
@ -337,9 +339,11 @@ union_allocvp(vpp, mp, undvp, dvp, cnp, uppervp, lowervp, docache)
int docache;
{
int error;
struct vattr va;
struct union_node *un = NULL;
struct vnode *xlowervp = NULLVP;
struct union_mount *um = MOUNTTOUNIONMOUNT(mp);
voff_t uppersz, lowersz;
int hash = 0;
int vflag;
int try;
@ -460,9 +464,15 @@ loop:
* is locked or nil.
*/
uppersz = lowersz = VNOVAL;
/*
* Save information about the upper layer.
*/
if (uppervp != NULLVP)
if (VOP_GETATTR(uppervp, &va, FSCRED, NULL) == 0)
uppersz = va.va_size;
if (uppervp != un->un_uppervp) {
union_newupper(un, uppervp);
} else if (uppervp) {
@ -480,6 +490,10 @@ loop:
* and directory information which union_vn_create
* might need.
*/
if (lowervp != NULLVP)
if (VOP_GETATTR(lowervp, &va, FSCRED, NULL) == 0)
lowersz = va.va_size;
if (lowervp != un->un_lowervp) {
union_newlower(un, lowervp);
if (cnp && (lowervp != NULLVP)) {
@ -536,15 +550,18 @@ loop:
un = VTOUNION(*vpp);
un->un_vnode = *vpp;
un->un_uppervp = uppervp;
un->un_uppersz = VNOVAL;
un->un_lowervp = lowervp;
un->un_lowersz = VNOVAL;
un->un_pvp = undvp;
if (undvp != NULLVP)
VREF(undvp);
un->un_dircache = 0;
un->un_openl = 0;
un->un_flags = UN_LOCKED;
un->un_uppersz = VNOVAL;
un->un_lowersz = VNOVAL;
union_newsize(*vpp, uppersz, lowersz);
if (un->un_uppervp)
un->un_flags |= UN_ULOCK;
#ifdef DIAGNOSTIC