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

The VATTR_NULL/VREF/VHOLD/HOLDRELE() macros lost their will to live

Browse Source 
years ago when the kernel was modified to not alter ABI based on
DIAGNOSTIC, and now just call the respective function interfaces
(in lowercase).  Plenty of mix'n match upper/lowercase has creeped
into the tree since then.  Nuke the macros and convert all callsites
to lowercase.

no functional change
This commit is contained in:
pooka 2010-01-08 11:35:07 +00:00
parent e828ea6b56
commit c3183f3251
56 changed files with 258 additions and 263 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/compat/common/vfs_syscalls_43.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: vfs_syscalls_43.c,v 1.50 2009/03/17 00:01:54 dyoung Exp $ */
/* $NetBSD: vfs_syscalls_43.c,v 1.51 2010/01/08 11:35:07 pooka Exp $ */
/*
* Copyright (c) 1989, 1993
@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: vfs_syscalls_43.c,v 1.50 2009/03/17 00:01:54 dyoung Exp $");
__KERNEL_RCSID(0, "$NetBSD: vfs_syscalls_43.c,v 1.51 2010/01/08 11:35:07 pooka Exp $");
#if defined(_KERNEL_OPT)
#include "opt_compat_netbsd.h"
@ -433,7 +433,7 @@ unionread:
(vp->v_mount->mnt_flag & MNT_UNION)) {
struct vnode *tvp = vp;
vp = vp->v_mount->mnt_vnodecovered;
VREF(vp);
vref(vp);
fp->f_data = (void *) vp;
fp->f_offset = 0;
vrele(tvp);

6
sys/compat/irix/irix_mman.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: irix_mman.c,v 1.22 2008/04/28 20:23:41 martin Exp $ */
/* $NetBSD: irix_mman.c,v 1.23 2010/01/08 11:35:07 pooka Exp $ */
/*-
* Copyright (c) 2002, 2008 The NetBSD Foundation, Inc.
@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: irix_mman.c,v 1.22 2008/04/28 20:23:41 martin Exp $");
__KERNEL_RCSID(0, "$NetBSD: irix_mman.c,v 1.23 2010/01/08 11:35:07 pooka Exp $");
#if defined(_KERNEL_OPT)
#include "opt_sysv.h"
@ -180,7 +180,7 @@ irix_mmap(struct lwp *l, void *addr, size_t len, int prot, int flags, int fd, of
goto out;
if (pos + len > vattr.va_size) {
VATTR_NULL(&vattr);
vattr_null(&vattr);
vattr.va_size = round_page(pos + len);
vn_lock(vp, LK_EXCLUSIVE | LK_RETRY);

6
sys/fs/adosfs/adlookup.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: adlookup.c,v 1.12 2009/03/14 21:04:23 dsl Exp $ */
/* $NetBSD: adlookup.c,v 1.13 2010/01/08 11:35:08 pooka Exp $ */
/*
* Copyright (c) 1994 Christian E. Hopps
@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: adlookup.c,v 1.12 2009/03/14 21:04:23 dsl Exp $");
__KERNEL_RCSID(0, "$NetBSD: adlookup.c,v 1.13 2010/01/08 11:35:08 pooka Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -240,7 +240,7 @@ found:
nocache = 1;
}
if (vdp == *vpp)
VREF(vdp);
vref(vdp);
found_lockdone:
if ((cnp->cn_flags & MAKEENTRY) && nocache == 0)
cache_enter(vdp, *vpp, cnp);

6
sys/fs/cd9660/cd9660_lookup.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: cd9660_lookup.c,v 1.16 2008/05/16 09:21:59 hannken Exp $ */
/* $NetBSD: cd9660_lookup.c,v 1.17 2010/01/08 11:35:08 pooka Exp $ */
/*-
* Copyright (c) 1989, 1993, 1994
@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: cd9660_lookup.c,v 1.16 2008/05/16 09:21:59 hannken Exp $");
__KERNEL_RCSID(0, "$NetBSD: cd9660_lookup.c,v 1.17 2010/01/08 11:35:08 pooka Exp $");
#include <sys/param.h>
#include <sys/namei.h>
@ -389,7 +389,7 @@ found:
return error;
*vpp = tdp;
} else if (dp->i_number == dp->i_ino) {
VREF(vdp); /* we want ourself, ie "." */
vref(vdp); /* we want ourself, ie "." */
*vpp = vdp;
} else {
error = cd9660_vget_internal(vdp->v_mount, dp->i_ino, &tdp,

6
sys/fs/cd9660/cd9660_vfsops.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: cd9660_vfsops.c,v 1.68 2009/10/19 17:53:36 tsutsui Exp $ */
/* $NetBSD: cd9660_vfsops.c,v 1.69 2010/01/08 11:35:08 pooka Exp $ */
/*-
* Copyright (c) 1994
@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: cd9660_vfsops.c,v 1.68 2009/10/19 17:53:36 tsutsui Exp $");
__KERNEL_RCSID(0, "$NetBSD: cd9660_vfsops.c,v 1.69 2010/01/08 11:35:08 pooka Exp $");
#if defined(_KERNEL_OPT)
#include "opt_compat_netbsd.h"
@ -807,7 +807,7 @@ cd9660_vget_internal(struct mount *mp, ino_t ino, struct vnode **vpp,
} else
bp = 0;
VREF(ip->i_devvp);
vref(ip->i_devvp);
if (relocated) {
/*

6
sys/fs/filecorefs/filecore_lookup.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: filecore_lookup.c,v 1.11 2009/03/14 21:04:23 dsl Exp $ */
/* $NetBSD: filecore_lookup.c,v 1.12 2010/01/08 11:35:08 pooka Exp $ */
/*-
* Copyright (c) 1989, 1993, 1994 The Regents of the University of California.
@ -66,7 +66,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: filecore_lookup.c,v 1.11 2009/03/14 21:04:23 dsl Exp $");
__KERNEL_RCSID(0, "$NetBSD: filecore_lookup.c,v 1.12 2010/01/08 11:35:08 pooka Exp $");
#include <sys/param.h>
#include <sys/namei.h>
@ -300,7 +300,7 @@ found:
}
*vpp = tdp;
} else if (name[0] == '.' && namelen == 1) {
VREF(vdp); /* we want ourself, ie "." */
vref(vdp); /* we want ourself, ie "." */
*vpp = vdp;
} else {
#ifdef FILECORE_DEBUG_BR

6
sys/fs/filecorefs/filecore_vfsops.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: filecore_vfsops.c,v 1.60 2009/06/29 05:08:17 dholland Exp $ */
/* $NetBSD: filecore_vfsops.c,v 1.61 2010/01/08 11:35:08 pooka Exp $ */
/*-
* Copyright (c) 1994 The Regents of the University of California.
@ -66,7 +66,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: filecore_vfsops.c,v 1.60 2009/06/29 05:08:17 dholland Exp $");
__KERNEL_RCSID(0, "$NetBSD: filecore_vfsops.c,v 1.61 2010/01/08 11:35:08 pooka Exp $");
#if defined(_KERNEL_OPT)
#include "opt_compat_netbsd.h"
@ -639,7 +639,7 @@ filecore_vget(struct mount *mp, ino_t ino, struct vnode **vpp)
ip->i_mnt = fcmp;
ip->i_devvp = fcmp->fc_devvp;
ip->i_diroff = 0;
VREF(ip->i_devvp);
vref(ip->i_devvp);
/*
* Setup type

6
sys/fs/hfs/hfs_vfsops.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: hfs_vfsops.c,v 1.24 2009/12/03 14:29:04 pooka Exp $ */
/* $NetBSD: hfs_vfsops.c,v 1.25 2010/01/08 11:35:08 pooka Exp $ */
/*-
* Copyright (c) 2005, 2007 The NetBSD Foundation, Inc.
@ -99,7 +99,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: hfs_vfsops.c,v 1.24 2009/12/03 14:29:04 pooka Exp $");
__KERNEL_RCSID(0, "$NetBSD: hfs_vfsops.c,v 1.25 2010/01/08 11:35:08 pooka Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@ -618,7 +618,7 @@ hfs_vget_internal(struct mount *mp, ino_t ino, uint8_t fork,
hfs_vinit(mp, hfs_specop_p, hfs_fifoop_p, &vp);
hnode->h_devvp = hmp->hm_devvp;
VREF(hnode->h_devvp); /* Increment the ref count to the volume's device. */
vref(hnode->h_devvp); /* Increment the ref count to the volume's device. */
/* Make sure UVM has allocated enough memory. (?) */
if (hnode->h_rec.u.rec_type == HFS_REC_FILE) {

8
sys/fs/hfs/hfs_vnops.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: hfs_vnops.c,v 1.15 2009/07/03 21:17:41 elad Exp $ */
/* $NetBSD: hfs_vnops.c,v 1.16 2010/01/08 11:35:08 pooka Exp $ */
/*-
* Copyright (c) 2005, 2007 The NetBSD Foundation, Inc.
@ -101,7 +101,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: hfs_vnops.c,v 1.15 2009/07/03 21:17:41 elad Exp $");
__KERNEL_RCSID(0, "$NetBSD: hfs_vnops.c,v 1.16 2010/01/08 11:35:08 pooka Exp $");
#ifdef _KERNEL_OPT
#include "opt_ipsec.h"
@ -378,7 +378,7 @@ hfs_vop_lookup(void *v)
/* if (cnp->cn_namelen == 1 && *pname == '.') {
*vpp = vdp;
VREF(vdp);
vref(vdp);
return (0);
}*/
@ -394,7 +394,7 @@ hfs_vop_lookup(void *v)
/* } else if (dp->h_rec.u.cnid == rec.file.u.cnid) {*/
} else if (cnp->cn_namelen == 1 && pname[0] == '.') {
/*printf("DOT ");*/
VREF(vdp); /* we want ourself, ie "." */
vref(vdp); /* we want ourself, ie "." */
*vpp = vdp;
} else {
hfs_callback_args cbargs;

6
sys/fs/msdosfs/msdosfs_denode.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: msdosfs_denode.c,v 1.36 2009/03/15 17:15:57 cegger Exp $ */
/* $NetBSD: msdosfs_denode.c,v 1.37 2010/01/08 11:35:08 pooka Exp $ */
/*-
* Copyright (C) 1994, 1995, 1997 Wolfgang Solfrank.
@ -48,7 +48,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: msdosfs_denode.c,v 1.36 2009/03/15 17:15:57 cegger Exp $");
__KERNEL_RCSID(0, "$NetBSD: msdosfs_denode.c,v 1.37 2010/01/08 11:35:08 pooka Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -383,7 +383,7 @@ deget(struct msdosfsmount *pmp, u_long dirclust, u_long diroffset, struct denode
}
} else
nvp->v_type = VREG;
VREF(ldep->de_devvp);
vref(ldep->de_devvp);
*depp = ldep;
uvm_vnp_setsize(nvp, ldep->de_FileSize);
return (0);

8
sys/fs/msdosfs/msdosfs_lookup.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: msdosfs_lookup.c,v 1.19 2009/03/14 21:04:23 dsl Exp $ */
/* $NetBSD: msdosfs_lookup.c,v 1.20 2010/01/08 11:35:08 pooka Exp $ */
/*-
* Copyright (C) 1994, 1995, 1997 Wolfgang Solfrank.
@ -48,7 +48,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: msdosfs_lookup.c,v 1.19 2009/03/14 21:04:23 dsl Exp $");
__KERNEL_RCSID(0, "$NetBSD: msdosfs_lookup.c,v 1.20 2010/01/08 11:35:08 pooka Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -475,7 +475,7 @@ foundroot:
* Save directory inode pointer in ndp->ni_dvp for dirremove().
*/
if (dp->de_StartCluster == scn && isadir) { /* "." */
VREF(vdp);
vref(vdp);
*vpp = vdp;
return (0);
}
@ -546,7 +546,7 @@ foundroot:
}
*vpp = DETOV(tdp);
} else if (dp->de_StartCluster == scn && isadir) {
VREF(vdp); /* we want ourself, ie "." */
vref(vdp); /* we want ourself, ie "." */
*vpp = vdp;
} else {
if ((error = deget(pmp, cluster, blkoff, &tdp)) != 0)

8
sys/fs/nilfs/nilfs_vnops.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: nilfs_vnops.c,v 1.3 2010/01/05 13:30:11 mbalmer Exp $ */
/* $NetBSD: nilfs_vnops.c,v 1.4 2010/01/08 11:35:08 pooka Exp $ */
/*
* Copyright (c) 2008, 2009 Reinoud Zandijk
@ -28,7 +28,7 @@
#include <sys/cdefs.h>
#ifndef lint
__KERNEL_RCSID(0, "$NetBSD: nilfs_vnops.c,v 1.3 2010/01/05 13:30:11 mbalmer Exp $");
__KERNEL_RCSID(0, "$NetBSD: nilfs_vnops.c,v 1.4 2010/01/08 11:35:08 pooka Exp $");
#endif /* not lint */
@ -648,7 +648,7 @@ nilfs_lookup(void *v)
if ((cnp->cn_namelen == 1) && (cnp->cn_nameptr[0] == '.')) {
DPRINTF(LOOKUP, ("\tlookup '.'\n"));
/* special case 1 '.' */
VREF(dvp);
vref(dvp);
*vpp = dvp;
/* done */
} else if (cnp->cn_flags & ISDOTDOT) {
@ -776,7 +776,7 @@ nilfs_getattr(void *v)
DPRINTF(VFSCALL, ("nilfs_getattr called\n"));
/* basic info */
VATTR_NULL(vap);
vattr_null(vap);
vap->va_type = vp->v_type;
vap->va_mode = nilfs_rw16(inode->i_mode); /* XXX same? */
vap->va_nlink = nilfs_rw16(inode->i_links_count);

6
sys/fs/ntfs/ntfs_subr.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ntfs_subr.c,v 1.43 2009/09/01 15:16:41 pooka Exp $ */
/* $NetBSD: ntfs_subr.c,v 1.44 2010/01/08 11:35:08 pooka Exp $ */
/*-
* Copyright (c) 1998, 1999 Semen Ustimenko (semenu@FreeBSD.org)
@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: ntfs_subr.c,v 1.43 2009/09/01 15:16:41 pooka Exp $");
__KERNEL_RCSID(0, "$NetBSD: ntfs_subr.c,v 1.44 2010/01/08 11:35:08 pooka Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -989,7 +989,7 @@ ntfs_ntlookupfile(
(attrname && fp->f_attrname &&
!strcmp(attrname, fp->f_attrname))))
{
VREF(vp);
vref(vp);
*vpp = vp;
error = 0;
goto fail;

8
sys/fs/ntfs/ntfs_vfsops.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ntfs_vfsops.c,v 1.79 2009/09/01 15:16:41 pooka Exp $ */
/* $NetBSD: ntfs_vfsops.c,v 1.80 2010/01/08 11:35:08 pooka Exp $ */
/*-
* Copyright (c) 1998, 1999 Semen Ustimenko
@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: ntfs_vfsops.c,v 1.79 2009/09/01 15:16:41 pooka Exp $");
__KERNEL_RCSID(0, "$NetBSD: ntfs_vfsops.c,v 1.80 2010/01/08 11:35:08 pooka Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -380,7 +380,7 @@ ntfs_mountfs(struct vnode *devvp, struct mount *mp, struct ntfs_args *argsp, str
if(error)
goto out1;
ntmp->ntm_sysvn[pi[i]]->v_vflag |= VV_SYSTEM;
VREF(ntmp->ntm_sysvn[pi[i]]);
vref(ntmp->ntm_sysvn[pi[i]]);
vput(ntmp->ntm_sysvn[pi[i]]);
}
}
@ -816,7 +816,7 @@ ntfs_vgetex(
}
uvm_vnp_setsize(vp, fp->f_size); /* XXX: mess, cf. ntfs_lookupfile() */
VREF(ip->i_devvp);
vref(ip->i_devvp);
*vpp = vp;
return (0);
}

6
sys/fs/ntfs/ntfs_vnops.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ntfs_vnops.c,v 1.45 2009/07/03 21:17:41 elad Exp $ */
/* $NetBSD: ntfs_vnops.c,v 1.46 2010/01/08 11:35:08 pooka Exp $ */
/*
* Copyright (c) 1992, 1993
@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: ntfs_vnops.c,v 1.45 2009/07/03 21:17:41 elad Exp $");
__KERNEL_RCSID(0, "$NetBSD: ntfs_vnops.c,v 1.46 2010/01/08 11:35:08 pooka Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -690,7 +690,7 @@ ntfs_lookup(void *v)
dprintf(("ntfs_lookup: faking . directory in %llu\n",
(unsigned long long)dip->i_number));
VREF(dvp);
vref(dvp);
*ap->a_vpp = dvp;
error = 0;
} else if (cnp->cn_flags & ISDOTDOT) {

6
sys/fs/ptyfs/ptyfs_vfsops.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ptyfs_vfsops.c,v 1.41 2009/11/30 10:59:19 pooka Exp $ */
/* $NetBSD: ptyfs_vfsops.c,v 1.42 2010/01/08 11:35:09 pooka Exp $ */
/*
* Copyright (c) 1992, 1993, 1995
@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: ptyfs_vfsops.c,v 1.41 2009/11/30 10:59:19 pooka Exp $");
__KERNEL_RCSID(0, "$NetBSD: ptyfs_vfsops.c,v 1.42 2010/01/08 11:35:09 pooka Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -176,7 +176,7 @@ ptyfs__getvattr(struct ptm_pty *pt, struct lwp *l, struct vattr *vattr)
{
struct mount *mp = pt->arg;
struct ptyfsmount *pmnt = VFSTOPTY(mp);
VATTR_NULL(vattr);
vattr_null(vattr);
/* get real uid */
vattr->va_uid = kauth_cred_getuid(l->l_cred);
vattr->va_gid = pmnt->pmnt_gid;

8
sys/fs/ptyfs/ptyfs_vnops.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ptyfs_vnops.c,v 1.32 2009/07/03 21:17:40 elad Exp $ */
/* $NetBSD: ptyfs_vnops.c,v 1.33 2010/01/08 11:35:09 pooka Exp $ */
/*
* Copyright (c) 1993, 1995
@ -76,7 +76,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: ptyfs_vnops.c,v 1.32 2009/07/03 21:17:40 elad Exp $");
__KERNEL_RCSID(0, "$NetBSD: ptyfs_vnops.c,v 1.33 2010/01/08 11:35:09 pooka Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -305,7 +305,7 @@ ptyfs_getattr(void *v)
PTYFS_ITIMES(ptyfs, NULL, NULL, NULL);
/* start by zeroing out the attributes */
VATTR_NULL(vap);
vattr_null(vap);
/* next do all the common fields */
vap->va_type = ap->a_vp->v_type;
@ -583,7 +583,7 @@ ptyfs_lookup(void *v)
if (cnp->cn_namelen == 1 && *pname == '.') {
*vpp = dvp;
VREF(dvp);
vref(dvp);
return 0;
}

6
sys/fs/smbfs/smbfs_vnops.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: smbfs_vnops.c,v 1.73 2009/07/04 07:36:46 cegger Exp $ */
/* $NetBSD: smbfs_vnops.c,v 1.74 2010/01/08 11:35:09 pooka Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@ -64,7 +64,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: smbfs_vnops.c,v 1.73 2009/07/04 07:36:46 cegger Exp $");
__KERNEL_RCSID(0, "$NetBSD: smbfs_vnops.c,v 1.74 2010/01/08 11:35:09 pooka Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -1337,7 +1337,7 @@ smbfs_lookup(void *v)
/*
* "." lookup
*/
VREF(dvp);
vref(dvp);
*vpp = dvp;
} else if (flags & ISDOTDOT) {

6
sys/fs/sysvbfs/sysvbfs_vnops.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: sysvbfs_vnops.c,v 1.25 2010/01/05 13:30:11 mbalmer Exp $ */
/* $NetBSD: sysvbfs_vnops.c,v 1.26 2010/01/08 11:35:09 pooka Exp $ */
/*-
* Copyright (c) 2004 The NetBSD Foundation, Inc.
@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: sysvbfs_vnops.c,v 1.25 2010/01/05 13:30:11 mbalmer Exp $");
__KERNEL_RCSID(0, "$NetBSD: sysvbfs_vnops.c,v 1.26 2010/01/08 11:35:09 pooka Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@ -90,7 +90,7 @@ sysvbfs_lookup(void *arg)
if (namelen == 1 && name[0] == '.') { /* "." */
VREF(v);
vref(v);
*a->a_vpp = v;
} else { /* Regular file */
if (!bfs_dirent_lookup_by_name(bfs, cnp->cn_nameptr,

8
sys/fs/tmpfs/tmpfs_vnops.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: tmpfs_vnops.c,v 1.65 2009/11/22 17:09:58 jmmv Exp $ */
/* $NetBSD: tmpfs_vnops.c,v 1.66 2010/01/08 11:35:09 pooka Exp $ */
/*
* Copyright (c) 2005, 2006, 2007 The NetBSD Foundation, Inc.
@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: tmpfs_vnops.c,v 1.65 2009/11/22 17:09:58 jmmv Exp $");
__KERNEL_RCSID(0, "$NetBSD: tmpfs_vnops.c,v 1.66 2010/01/08 11:35:09 pooka Exp $");
#include <sys/param.h>
#include <sys/dirent.h>
@ -163,7 +163,7 @@ tmpfs_lookup(void *v)
vn_lock(dvp, LK_EXCLUSIVE | LK_RETRY);
} else if (cnp->cn_namelen == 1 && cnp->cn_nameptr[0] == '.') {
VREF(dvp);
vref(dvp);
*vpp = dvp;
error = 0;
} else {
@ -443,7 +443,7 @@ tmpfs_getattr(void *v)
node = VP_TO_TMPFS_NODE(vp);
VATTR_NULL(vap);
vattr_null(vap);
tmpfs_itimes(vp, NULL, NULL, NULL);

8
sys/fs/udf/udf_vnops.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: udf_vnops.c,v 1.56 2010/01/05 13:30:11 mbalmer Exp $ */
/* $NetBSD: udf_vnops.c,v 1.57 2010/01/08 11:35:09 pooka Exp $ */
/*
* Copyright (c) 2006, 2008 Reinoud Zandijk
@ -32,7 +32,7 @@
#include <sys/cdefs.h>
#ifndef lint
__KERNEL_RCSID(0, "$NetBSD: udf_vnops.c,v 1.56 2010/01/05 13:30:11 mbalmer Exp $");
__KERNEL_RCSID(0, "$NetBSD: udf_vnops.c,v 1.57 2010/01/08 11:35:09 pooka Exp $");
#endif /* not lint */
@ -704,7 +704,7 @@ udf_lookup(void *v)
if ((cnp->cn_namelen == 1) && (cnp->cn_nameptr[0] == '.')) {
DPRINTF(LOOKUP, ("\tlookup '.'\n"));
/* special case 1 '.' */
VREF(dvp);
vref(dvp);
*vpp = dvp;
/* done */
} else if (cnp->cn_flags & ISDOTDOT) {
@ -883,7 +883,7 @@ udf_getattr(void *v)
gid = ump->mount_args.anon_gid;
/* fill in struct vattr with values from the node */
VATTR_NULL(vap);
vattr_null(vap);
vap->va_type = vp->v_type;
vap->va_mode = udf_getaccessmode(udf_node);
vap->va_nlink = nlink;

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

@ -1,4 +1,4 @@
/* $NetBSD: union_subr.c,v 1.34 2008/12/17 20:51:35 cegger Exp $ */
/* $NetBSD: union_subr.c,v 1.35 2010/01/08 11:35:09 pooka Exp $ */
/*
* Copyright (c) 1994
@ -72,7 +72,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: union_subr.c,v 1.34 2008/12/17 20:51:35 cegger Exp $");
__KERNEL_RCSID(0, "$NetBSD: union_subr.c,v 1.35 2010/01/08 11:35:09 pooka Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -354,7 +354,7 @@ union_allocvp(
if (lowervp == NULLVP) {
lowervp = um->um_lowervp;
if (lowervp != NULLVP)
VREF(lowervp);
vref(lowervp);
}
iflag = 0;
vflag = VV_ROOT;
@ -485,7 +485,7 @@ loop:
memcpy(un->un_path, cnp->cn_nameptr,
cnp->cn_namelen);
un->un_path[cnp->cn_namelen] = '\0';
VREF(dvp);
vref(dvp);
un->un_dirvp = dvp;
}
} else if (lowervp) {
@ -543,7 +543,7 @@ loop:
un->un_lowervp = lowervp;
un->un_pvp = undvp;
if (undvp != NULLVP)
VREF(undvp);
vref(undvp);
un->un_dircache = 0;
un->un_openl = 0;
un->un_flags = UN_LOCKED;
@ -565,7 +565,7 @@ loop:
un->un_path = malloc(cnp->cn_namelen+1, M_TEMP, M_WAITOK);
memcpy(un->un_path, cnp->cn_nameptr, cnp->cn_namelen);
un->un_path[cnp->cn_namelen] = '\0';
VREF(dvp);
vref(dvp);
un->un_dirvp = dvp;
} else {
un->un_hash = 0;
@ -720,7 +720,7 @@ union_copyup(struct union_node *un, int docopy, kauth_cred_t cred,
}
if (error == 0) {
/* Copy permissions up too */
VATTR_NULL(&uvattr);
vattr_null(&uvattr);
uvattr.va_mode = lvattr.va_mode;
uvattr.va_flags = lvattr.va_flags;
error = VOP_SETATTR(uvp, &uvattr, cred);
@ -855,7 +855,7 @@ union_mkshadow(struct union_mount *um, struct vnode *dvp,
* mkdir syscall). (jsp, kb)
*/
VATTR_NULL(&va);
vattr_null(&va);
va.va_type = VDIR;
va.va_mode = um->um_cmode;
@ -970,7 +970,7 @@ union_vn_create(struct vnode **vpp, struct union_node *un, struct lwp *l)
* require access to the top-level file.
* TODO: confirm choice of access permissions.
*/
VATTR_NULL(vap);
vattr_null(vap);
vap->va_type = VREG;
vap->va_mode = cmode;
vref(un->un_dirvp);
@ -1067,7 +1067,7 @@ union_dircache_r(struct vnode *vp, struct vnode ***vppp, int *cntp)
if (vp->v_op != union_vnodeop_p) {
if (vppp) {
VREF(vp);
vref(vp);
*(*vppp)++ = vp;
if (--(*cntp) == 0)
panic("union: dircache table too small");
@ -1123,7 +1123,7 @@ union_dircache(struct vnode *vp, struct lwp *l)
goto out;
vn_lock(*vpp, LK_EXCLUSIVE | LK_RETRY);
VREF(*vpp);
vref(*vpp);
error = union_allocvp(&nvp, vp->v_mount, NULLVP, NULLVP, 0, *vpp, NULLVP, 0);
if (!error) {
VTOUNION(vp)->un_dircache = 0;

10
sys/fs/union/union_vfsops.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: union_vfsops.c,v 1.60 2009/06/29 05:08:18 dholland Exp $ */
/* $NetBSD: union_vfsops.c,v 1.61 2010/01/08 11:35:09 pooka Exp $ */
/*
* Copyright (c) 1994 The Regents of the University of California.
@ -77,7 +77,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: union_vfsops.c,v 1.60 2009/06/29 05:08:18 dholland Exp $");
__KERNEL_RCSID(0, "$NetBSD: union_vfsops.c,v 1.61 2010/01/08 11:35:09 pooka Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -152,7 +152,7 @@ union_mount(struct mount *mp, const char *path, void *data, size_t *data_len)
"WARNING: it can cause crashes and file system corruption\n");
lowerrootvp = mp->mnt_vnodecovered;
VREF(lowerrootvp);
vref(lowerrootvp);
/*
* Find upper node.
@ -384,10 +384,10 @@ union_root(struct mount *mp, struct vnode **vpp)
/*
* Return locked reference to root.
*/
VREF(um->um_uppervp);
vref(um->um_uppervp);
vn_lock(um->um_uppervp, LK_EXCLUSIVE | LK_RETRY);
if (um->um_lowervp)
VREF(um->um_lowervp);
vref(um->um_lowervp);
error = union_allocvp(vpp, mp, NULL, NULL, NULL,
um->um_uppervp, um->um_lowervp, 1);

34
sys/fs/union/union_vnops.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: union_vnops.c,v 1.33 2008/05/06 18:43:44 ad Exp $ */
/* $NetBSD: union_vnops.c,v 1.34 2010/01/08 11:35:09 pooka Exp $ */
/*
* Copyright (c) 1992, 1993, 1994, 1995
@ -72,7 +72,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: union_vnops.c,v 1.33 2008/05/06 18:43:44 ad Exp $");
__KERNEL_RCSID(0, "$NetBSD: union_vnops.c,v 1.34 2010/01/08 11:35:09 pooka Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -293,7 +293,7 @@ union_lookup(void *v)
dvp = *ap->a_vpp = LOWERVP(ap->a_dvp);
if (dvp == NULLVP)
return (ENOENT);
VREF(dvp);
vref(dvp);
vn_lock(dvp, LK_EXCLUSIVE | LK_RETRY);
return (0);
}
@ -424,7 +424,7 @@ union_lookup(void *v)
if ((cnp->cn_flags & ISDOTDOT) && dun->un_pvp != NULLVP) {
lowervp = LOWERVP(dun->un_pvp);
if (lowervp != NULLVP) {
VREF(lowervp);
vref(lowervp);
vn_lock(lowervp, LK_EXCLUSIVE | LK_RETRY);
lerror = 0;
}
@ -538,7 +538,7 @@ union_create(void *v)
FIXUP(un);
VREF(dvp);
vref(dvp);
un->un_flags |= UN_KLOCK;
mp = ap->a_dvp->v_mount;
vput(ap->a_dvp);
@ -595,7 +595,7 @@ union_mknod(void *v)
FIXUP(un);
VREF(dvp);
vref(dvp);
un->un_flags |= UN_KLOCK;
mp = ap->a_dvp->v_mount;
vput(ap->a_dvp);
@ -1151,11 +1151,11 @@ union_remove(void *v)
struct vnode *vp = un->un_uppervp;
FIXUP(dun);
VREF(dvp);
vref(dvp);
dun->un_flags |= UN_KLOCK;
vput(ap->a_dvp);
FIXUP(un);
VREF(vp);
vref(vp);
un->un_flags |= UN_KLOCK;
vput(ap->a_vp);
@ -1260,7 +1260,7 @@ union_link(void *v)
}
FIXUP(dun);
VREF(dvp);
vref(dvp);
dun->un_flags |= UN_KLOCK;
vput(ap->a_dvp);
@ -1299,7 +1299,7 @@ union_rename(void *v)
}
fdvp = un->un_uppervp;
VREF(fdvp);
vref(fdvp);
}
if (fvp->v_op == union_vnodeop_p) { /* always true */
@ -1314,7 +1314,7 @@ union_rename(void *v)
ap->a_fcnp->cn_flags |= DOWHITEOUT;
fvp = un->un_uppervp;
VREF(fvp);
vref(fvp);
}
if (tdvp->v_op == union_vnodeop_p) {
@ -1331,7 +1331,7 @@ union_rename(void *v)
}
tdvp = un->un_uppervp;
VREF(tdvp);
vref(tdvp);
un->un_flags |= UN_KLOCK;
vput(ap->a_tdvp);
}
@ -1341,7 +1341,7 @@ union_rename(void *v)
tvp = un->un_uppervp;
if (tvp != NULLVP) {
VREF(tvp);
vref(tvp);
un->un_flags |= UN_KLOCK;
}
vput(ap->a_tvp);
@ -1385,7 +1385,7 @@ union_mkdir(void *v)
struct vnode *vp;
FIXUP(un);
VREF(dvp);
vref(dvp);
un->un_flags |= UN_KLOCK;
VOP_UNLOCK(ap->a_dvp, 0);
error = VOP_MKDIR(dvp, &vp, cnp, ap->a_vap);
@ -1427,11 +1427,11 @@ union_rmdir(void *v)
struct vnode *vp = un->un_uppervp;
FIXUP(dun);
VREF(dvp);
vref(dvp);
dun->un_flags |= UN_KLOCK;
vput(ap->a_dvp);
FIXUP(un);
VREF(vp);
vref(vp);
un->un_flags |= UN_KLOCK;
vput(ap->a_vp);
@ -1470,7 +1470,7 @@ union_symlink(void *v)
int error;
FIXUP(un);
VREF(dvp);
vref(dvp);
un->un_flags |= UN_KLOCK;
vput(ap->a_dvp);
error = VOP_SYMLINK(dvp, ap->a_vpp, cnp, ap->a_vap,

2
sys/fs/unionfs/unionfs_subr.c
View File

@ -239,7 +239,7 @@ unionfs_create_uppervattr_core(struct unionfs_mount *ump,
struct vattr *lva,
struct vattr *uva)
{
VATTR_NULL(uva);
vattr_null(uva);
uva->va_type = lva->va_type;
uva->va_atime = lva->va_atime;
uva->va_mtime = lva->va_mtime;

6
sys/kern/kern_acct.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: kern_acct.c,v 1.87 2009/02/11 00:32:45 enami Exp $ */
/* $NetBSD: kern_acct.c,v 1.88 2010/01/08 11:35:09 pooka Exp $ */
/*-
* Copyright (c) 1982, 1986, 1989, 1993
@ -71,7 +71,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: kern_acct.c,v 1.87 2009/02/11 00:32:45 enami Exp $");
__KERNEL_RCSID(0, "$NetBSD: kern_acct.c,v 1.88 2010/01/08 11:35:09 pooka Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -326,7 +326,7 @@ sys_acct(struct lwp *l, const struct sys_acct_args *uap, register_t *retval)
"%lu - incomplete record truncated\n",
(unsigned long)sizeof(struct acct));
#endif
VATTR_NULL(&va);
vattr_null(&va);
va.va_size = size;
error = VOP_SETATTR(nd.ni_vp, &va, l->l_cred);
if (error != 0) {

6
sys/kern/kern_core.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: kern_core.c,v 1.14 2009/01/11 02:45:52 christos Exp $ */
/* $NetBSD: kern_core.c,v 1.15 2010/01/08 11:35:10 pooka Exp $ */
/*
* Copyright (c) 1982, 1986, 1989, 1991, 1993
@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: kern_core.c,v 1.14 2009/01/11 02:45:52 christos Exp $");
__KERNEL_RCSID(0, "$NetBSD: kern_core.c,v 1.15 2010/01/08 11:35:10 pooka Exp $");
#include <sys/param.h>
#include <sys/vnode.h>
@ -186,7 +186,7 @@ coredump(struct lwp *l, const char *pattern)
error = EINVAL;
goto out;
}
VATTR_NULL(&vattr);
vattr_null(&vattr);
vattr.va_size = 0;
if ((p->p_flag & PK_SUGID) && security_setidcore_dump) {

6
sys/kern/kern_exec.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: kern_exec.c,v 1.292 2009/12/10 14:13:54 matt Exp $ */
/* $NetBSD: kern_exec.c,v 1.293 2010/01/08 11:35:10 pooka Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@ -59,7 +59,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: kern_exec.c,v 1.292 2009/12/10 14:13:54 matt Exp $");
__KERNEL_RCSID(0, "$NetBSD: kern_exec.c,v 1.293 2010/01/08 11:35:10 pooka Exp $");
#include "opt_ktrace.h"
#include "opt_modular.h"
@ -763,7 +763,7 @@ execve1(struct lwp *l, const char *path, char * const *args,
/* record proc's vnode, for use by procfs and others */
if (p->p_textvp)
vrele(p->p_textvp);
VREF(pack.ep_vp);
vref(pack.ep_vp);
p->p_textvp = pack.ep_vp;
/* Now map address space */

6
sys/kern/kern_fork.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: kern_fork.c,v 1.174 2009/10/21 21:12:06 rmind Exp $ */
/* $NetBSD: kern_fork.c,v 1.175 2010/01/08 11:35:10 pooka Exp $ */
/*-
* Copyright (c) 1999, 2001, 2004, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@ -67,7 +67,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: kern_fork.c,v 1.174 2009/10/21 21:12:06 rmind Exp $");
__KERNEL_RCSID(0, "$NetBSD: kern_fork.c,v 1.175 2010/01/08 11:35:10 pooka Exp $");
#include "opt_ktrace.h"
@ -329,7 +329,7 @@ fork1(struct lwp *l1, int flags, int exitsig, void *stack, size_t stacksize,
/* bump references to the text vnode (for procfs) */
p2->p_textvp = p1->p_textvp;
if (p2->p_textvp)
VREF(p2->p_textvp);
vref(p2->p_textvp);
if (flags & FORK_SHAREFILES)
fd_share(p2);

6
sys/kern/tty_bsdpty.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: tty_bsdpty.c,v 1.15 2009/01/22 14:38:35 yamt Exp $ */
/* $NetBSD: tty_bsdpty.c,v 1.16 2010/01/08 11:35:10 pooka Exp $ */
/*-
* Copyright (c) 2004 The NetBSD Foundation, Inc.
@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: tty_bsdpty.c,v 1.15 2009/01/22 14:38:35 yamt Exp $");
__KERNEL_RCSID(0, "$NetBSD: tty_bsdpty.c,v 1.16 2010/01/08 11:35:10 pooka Exp $");
#include "opt_ptm.h"
@ -136,7 +136,7 @@ static void
/*ARGSUSED*/
pty_getvattr(struct ptm_pty *ptm, struct lwp *l, struct vattr *vattr)
{
VATTR_NULL(vattr);
vattr_null(vattr);
/* get real uid */
vattr->va_uid = kauth_cred_getuid(l->l_cred);
vattr->va_gid = TTY_GID;

6
sys/kern/uipc_usrreq.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: uipc_usrreq.c,v 1.127 2009/08/26 22:34:47 bouyer Exp $ */
/* $NetBSD: uipc_usrreq.c,v 1.128 2010/01/08 11:35:10 pooka Exp $ */
/*-
* Copyright (c) 1998, 2000, 2004, 2008, 2009 The NetBSD Foundation, Inc.
@ -96,7 +96,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: uipc_usrreq.c,v 1.127 2009/08/26 22:34:47 bouyer Exp $");
__KERNEL_RCSID(0, "$NetBSD: uipc_usrreq.c,v 1.128 2010/01/08 11:35:10 pooka Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -907,7 +907,7 @@ unp_bind(struct socket *so, struct mbuf *nam, struct lwp *l)
error = EADDRINUSE;
goto bad;
}
VATTR_NULL(&vattr);
vattr_null(&vattr);
vattr.va_type = VSOCK;
vattr.va_mode = ACCESSPERMS & ~(p->p_cwdi->cwdi_cmask);
error = VOP_CREATE(nd.ni_dvp, &nd.ni_vp, &nd.ni_cnd, &vattr);

10
sys/kern/vfs_cwd.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: vfs_cwd.c,v 1.2 2009/09/24 06:14:22 yamt Exp $ */
/* $NetBSD: vfs_cwd.c,v 1.3 2010/01/08 11:35:10 pooka Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: vfs_cwd.c,v 1.2 2009/09/24 06:14:22 yamt Exp $");
__KERNEL_RCSID(0, "$NetBSD: vfs_cwd.c,v 1.3 2010/01/08 11:35:10 pooka Exp $");
#include <sys/param.h>
#include <sys/atomic.h>
@ -69,13 +69,13 @@ cwdinit(void)
rw_enter(&copy->cwdi_lock, RW_READER);
cwdi->cwdi_cdir = copy->cwdi_cdir;
if (cwdi->cwdi_cdir)
VREF(cwdi->cwdi_cdir);
vref(cwdi->cwdi_cdir);
cwdi->cwdi_rdir = copy->cwdi_rdir;
if (cwdi->cwdi_rdir)
VREF(cwdi->cwdi_rdir);
vref(cwdi->cwdi_rdir);
cwdi->cwdi_edir = copy->cwdi_edir;
if (cwdi->cwdi_edir)
VREF(cwdi->cwdi_edir);
vref(cwdi->cwdi_edir);
cwdi->cwdi_cmask = copy->cwdi_cmask;
cwdi->cwdi_refcnt = 1;
rw_exit(&copy->cwdi_lock);

12
sys/kern/vfs_getcwd.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: vfs_getcwd.c,v 1.43 2009/01/17 07:02:35 yamt Exp $ */
/* $NetBSD: vfs_getcwd.c,v 1.44 2010/01/08 11:35:10 pooka Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: vfs_getcwd.c,v 1.43 2009/01/17 07:02:35 yamt Exp $");
__KERNEL_RCSID(0, "$NetBSD: vfs_getcwd.c,v 1.44 2010/01/08 11:35:10 pooka Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -248,7 +248,7 @@ unionread:
uvp = uvp->v_mount->mnt_vnodecovered;
vput(tvp);
VREF(uvp);
vref(uvp);
*uvpp = uvp;
vn_lock(uvp, LK_EXCLUSIVE | LK_RETRY);
goto unionread;
@ -353,8 +353,8 @@ getcwd_common(struct vnode *lvp, struct vnode *rvp, char **bpp, char *bufp,
rvp = rootvnode;
}
VREF(rvp);
VREF(lvp);
vref(rvp);
vref(lvp);
/*
* Error handling invariant:
@ -409,7 +409,7 @@ getcwd_common(struct vnode *lvp, struct vnode *rvp, char **bpp, char *bufp,
error = ENOENT;
goto out;
}
VREF(lvp);
vref(lvp);
error = vn_lock(lvp, LK_EXCLUSIVE | LK_RETRY);
if (error != 0) {
vrele(lvp);

30
sys/kern/vfs_lookup.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: vfs_lookup.c,v 1.120 2009/09/27 17:23:54 dholland Exp $ */
/* $NetBSD: vfs_lookup.c,v 1.121 2010/01/08 11:35:10 pooka Exp $ */
/*
* Copyright (c) 1982, 1986, 1989, 1993
@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: vfs_lookup.c,v 1.120 2009/09/27 17:23:54 dholland Exp $");
__KERNEL_RCSID(0, "$NetBSD: vfs_lookup.c,v 1.121 2010/01/08 11:35:10 pooka Exp $");
#include "opt_magiclinks.h"
@ -374,7 +374,7 @@ namei_start2(struct namei_state *state)
state->namei_startdir = cwdi->cwdi_cdir;
ndp->ni_erootdir = NULL;
}
VREF(state->namei_startdir);
vref(state->namei_startdir);
rw_exit(&cwdi->cwdi_lock);
/*
@ -509,7 +509,7 @@ badlink:
ndp->ni_erootdir = NULL;
state->namei_startdir = ndp->ni_rootdir;
}
VREF(state->namei_startdir);
vref(state->namei_startdir);
vn_lock(state->namei_startdir, LK_EXCLUSIVE | LK_RETRY);
}
@ -855,7 +855,7 @@ lookup_once(struct namei_state *state)
if (state->dp == ndp->ni_rootdir || state->dp == rootvnode) {
ndp->ni_dvp = state->dp;
ndp->ni_vp = state->dp;
VREF(state->dp);
vref(state->dp);
return 0;
}
if (ndp->ni_rootdir != rootvnode) {
@ -876,8 +876,8 @@ lookup_once(struct namei_state *state)
state->dp = ndp->ni_rootdir;
ndp->ni_dvp = state->dp;
ndp->ni_vp = state->dp;
VREF(state->dp);
VREF(state->dp);
vref(state->dp);
vref(state->dp);
vn_lock(state->dp, LK_EXCLUSIVE | LK_RETRY);
return 0;
}
@ -888,7 +888,7 @@ lookup_once(struct namei_state *state)
tdp = state->dp;
state->dp = state->dp->v_mount->mnt_vnodecovered;
vput(tdp);
VREF(state->dp);
vref(state->dp);
vn_lock(state->dp, LK_EXCLUSIVE | LK_RETRY);
}
}
@ -915,7 +915,7 @@ unionlookup:
tdp = state->dp;
state->dp = state->dp->v_mount->mnt_vnodecovered;
vput(tdp);
VREF(state->dp);
vref(state->dp);
vn_lock(state->dp, LK_EXCLUSIVE | LK_RETRY);
goto unionlookup;
}
@ -947,7 +947,7 @@ unionlookup:
*/
if (cnp->cn_flags & SAVESTART) {
ndp->ni_startdir = ndp->ni_dvp;
VREF(ndp->ni_startdir);
vref(ndp->ni_startdir);
}
state->lookup_alldone = 1;
return (0);
@ -1094,7 +1094,7 @@ terminal:
ndp->ni_dvp = NULL;
vput(state->dp);
state->dp = ndp->ni_rootdir;
VREF(state->dp);
vref(state->dp);
vn_lock(state->dp, LK_EXCLUSIVE | LK_RETRY);
ndp->ni_vp = state->dp;
}
@ -1135,7 +1135,7 @@ terminal:
if (ndp->ni_dvp != NULL) {
if (cnp->cn_flags & SAVESTART) {
ndp->ni_startdir = ndp->ni_dvp;
VREF(ndp->ni_startdir);
vref(ndp->ni_startdir);
}
}
if ((cnp->cn_flags & LOCKLEAF) == 0) {
@ -1175,7 +1175,7 @@ lookup_for_nfsd(struct nameidata *ndp, struct vnode *dp, int neverfollow)
* BEGIN wodge of code from nfsd
*/
VREF(dp);
vref(dp);
vn_lock(dp, LK_EXCLUSIVE | LK_RETRY);
for (;;) {
@ -1281,7 +1281,7 @@ badlink:
if (state.cnp->cn_pnbuf[0] == '/') {
vput(dp);
dp = ndp->ni_rootdir;
VREF(dp);
vref(dp);
vn_lock(dp, LK_EXCLUSIVE | LK_RETRY);
}
}
@ -1400,7 +1400,7 @@ relookup(struct vnode *dvp, struct vnode **vpp, struct componentname *cnp)
goto bad;
}
if (cnp->cn_flags & SAVESTART)
VREF(dvp);
vref(dvp);
return (0);
bad:

8
sys/kern/vfs_subr.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: vfs_subr.c,v 1.393 2010/01/07 19:54:40 pooka Exp $ */
/* $NetBSD: vfs_subr.c,v 1.394 2010/01/08 11:35:10 pooka Exp $ */
/*-
* Copyright (c) 1997, 1998, 2004, 2005, 2007, 2008 The NetBSD Foundation, Inc.
@ -91,7 +91,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: vfs_subr.c,v 1.393 2010/01/07 19:54:40 pooka Exp $");
__KERNEL_RCSID(0, "$NetBSD: vfs_subr.c,v 1.394 2010/01/08 11:35:10 pooka Exp $");
#include "opt_ddb.h"
#include "opt_compat_netbsd.h"
@ -2597,7 +2597,7 @@ done:
if (error)
panic("cannot find root vnode, error=%d", error);
cwdi0.cwdi_cdir = rootvnode;
VREF(cwdi0.cwdi_cdir);
vref(cwdi0.cwdi_cdir);
VOP_UNLOCK(rootvnode, 0);
cwdi0.cwdi_rdir = NULL;
@ -2607,7 +2607,7 @@ done:
* share proc0's CWD info.
*/
initproc->p_cwdi->cwdi_cdir = rootvnode;
VREF(initproc->p_cwdi->cwdi_cdir);
vref(initproc->p_cwdi->cwdi_cdir);
initproc->p_cwdi->cwdi_rdir = NULL;
}
return (error);

38
sys/kern/vfs_syscalls.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: vfs_syscalls.c,v 1.401 2009/12/23 01:09:24 pooka Exp $ */
/* $NetBSD: vfs_syscalls.c,v 1.402 2010/01/08 11:35:10 pooka Exp $ */
/*-
* Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
@ -66,7 +66,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: vfs_syscalls.c,v 1.401 2009/12/23 01:09:24 pooka Exp $");
__KERNEL_RCSID(0, "$NetBSD: vfs_syscalls.c,v 1.402 2010/01/08 11:35:10 pooka Exp $");
#ifdef _KERNEL_OPT
#include "opt_fileassoc.h"
@ -571,12 +571,12 @@ checkdirs(struct vnode *olddp)
rw_enter(&cwdi->cwdi_lock, RW_WRITER);
if (cwdi->cwdi_cdir == olddp) {
rele1 = cwdi->cwdi_cdir;
VREF(newdp);
vref(newdp);
cwdi->cwdi_cdir = newdp;
}
if (cwdi->cwdi_rdir == olddp) {
rele2 = cwdi->cwdi_rdir;
VREF(newdp);
vref(newdp);
cwdi->cwdi_rdir = newdp;
}
rw_exit(&cwdi->cwdi_lock);
@ -593,7 +593,7 @@ checkdirs(struct vnode *olddp)
if (rootvnode == olddp) {
vrele(rootvnode);
VREF(newdp);
vref(newdp);
rootvnode = newdp;
}
vput(newdp);
@ -1074,7 +1074,7 @@ sys_fchdir(struct lwp *l, const struct sys_fchdir_args *uap, register_t *retval)
return (error);
vp = fp->f_data;
VREF(vp);
vref(vp);
vn_lock(vp, LK_EXCLUSIVE | LK_RETRY);
if (vp->v_type != VDIR)
error = ENOTDIR;
@ -1144,7 +1144,7 @@ sys_fchroot(struct lwp *l, const struct sys_fchroot_args *uap, register_t *retva
VOP_UNLOCK(vp, 0);
if (error)
goto out;
VREF(vp);
vref(vp);
change_root(p->p_cwdi, vp, l);
@ -1229,7 +1229,7 @@ change_root(struct cwdinfo *cwdi, struct vnode *vp, struct lwp *l)
* deadfs node here instead
*/
vrele(cwdi->cwdi_cdir);
VREF(vp);
vref(vp);
cwdi->cwdi_cdir = vp;
}
rw_exit(&cwdi->cwdi_lock);
@ -1625,7 +1625,7 @@ dofhopen(struct lwp *l, const void *ufhp, size_t fhsize, int oflags,
if (flags & O_TRUNC) {
VOP_UNLOCK(vp, 0); /* XXX */
vn_lock(vp, LK_EXCLUSIVE | LK_RETRY); /* XXX */
VATTR_NULL(&va);
vattr_null(&va);
va.va_size = 0;
error = VOP_SETATTR(vp, &va, cred);
if (error)
@ -1836,7 +1836,7 @@ do_sys_mknod(struct lwp *l, const char *pathname, mode_t mode, dev_t dev,
if (vp != NULL)
error = EEXIST;
else {
VATTR_NULL(&vattr);
vattr_null(&vattr);
/* We will read cwdi->cwdi_cmask unlocked. */
vattr.va_mode = (mode & ALLPERMS) &~ p->p_cwdi->cwdi_cmask;
vattr.va_rdev = dev;
@ -1934,7 +1934,7 @@ sys_mkfifo(struct lwp *l, const struct sys_mkfifo_args *uap, register_t *retval)
vrele(nd.ni_vp);
return (EEXIST);
}
VATTR_NULL(&vattr);
vattr_null(&vattr);
vattr.va_type = VFIFO;
/* We will read cwdi->cwdi_cmask unlocked. */
vattr.va_mode = (SCARG(uap, mode) & ALLPERMS) &~ p->p_cwdi->cwdi_cmask;
@ -2018,7 +2018,7 @@ sys_symlink(struct lwp *l, const struct sys_symlink_args *uap, register_t *retva
error = EEXIST;
goto out;
}
VATTR_NULL(&vattr);
vattr_null(&vattr);
vattr.va_type = VLNK;
/* We will read cwdi->cwdi_cmask unlocked. */
vattr.va_mode = ACCESSPERMS &~ p->p_cwdi->cwdi_cmask;
@ -2585,7 +2585,7 @@ change_flags(struct vnode *vp, u_long flags, struct lwp *l)
goto out;
}
}
VATTR_NULL(&vattr);
vattr_null(&vattr);
vattr.va_flags = flags;
error = VOP_SETATTR(vp, &vattr, l->l_cred);
out:
@ -2674,7 +2674,7 @@ change_mode(struct vnode *vp, int mode, struct lwp *l)
int error;
vn_lock(vp, LK_EXCLUSIVE | LK_RETRY);
VATTR_NULL(&vattr);
vattr_null(&vattr);
vattr.va_mode = mode & ALLPERMS;
error = VOP_SETATTR(vp, &vattr, l->l_cred);
VOP_UNLOCK(vp, 0);
@ -2877,7 +2877,7 @@ change_owner(struct vnode *vp, uid_t uid, gid_t gid, struct lwp *l,
if (vattr.va_mode == newmode)
newmode = VNOVAL;
VATTR_NULL(&vattr);
vattr_null(&vattr);
vattr.va_uid = CHANGED(uid) ? uid : (uid_t)VNOVAL;
vattr.va_gid = CHANGED(gid) ? gid : (gid_t)VNOVAL;
vattr.va_mode = newmode;
@ -3002,7 +3002,7 @@ do_sys_utimes(struct lwp *l, struct vnode *vp, const char *path, int flag,
vn_lock(vp, LK_EXCLUSIVE | LK_RETRY);
setbirthtime = (VOP_GETATTR(vp, &vattr, l->l_cred) == 0 &&
timespeccmp(&ts[1], &vattr.va_birthtime, <));
VATTR_NULL(&vattr);
vattr_null(&vattr);
vattr.va_atime = ts[0];
vattr.va_mtime = ts[1];
if (setbirthtime)
@ -3043,7 +3043,7 @@ sys_truncate(struct lwp *l, const struct sys_truncate_args *uap, register_t *ret
error = EISDIR;
else if ((error = vn_writechk(vp)) == 0 &&
(error = VOP_ACCESS(vp, VWRITE, l->l_cred)) == 0) {
VATTR_NULL(&vattr);
vattr_null(&vattr);
vattr.va_size = SCARG(uap, length);
error = VOP_SETATTR(vp, &vattr, l->l_cred);
}
@ -3080,7 +3080,7 @@ sys_ftruncate(struct lwp *l, const struct sys_ftruncate_args *uap, register_t *r
if (vp->v_type == VDIR)
error = EISDIR;
else if ((error = vn_writechk(vp)) == 0) {
VATTR_NULL(&vattr);
vattr_null(&vattr);
vattr.va_size = SCARG(uap, length);
error = VOP_SETATTR(vp, &vattr, fp->f_cred);
}
@ -3455,7 +3455,7 @@ do_sys_mkdir(const char *path, mode_t mode, enum uio_seg seg)
vrele(vp);
return (EEXIST);
}
VATTR_NULL(&vattr);
vattr_null(&vattr);
vattr.va_type = VDIR;
/* We will read cwdi->cwdi_cmask unlocked. */
vattr.va_mode = (mode & ACCESSPERMS) &~ p->p_cwdi->cwdi_cmask;

12
sys/kern/vfs_vnops.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: vfs_vnops.c,v 1.168 2009/12/20 09:36:06 dsl Exp $ */
/* $NetBSD: vfs_vnops.c,v 1.169 2010/01/08 11:35:10 pooka Exp $ */
/*-
* Copyright (c) 2009 The NetBSD Foundation, Inc.
@ -66,7 +66,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: vfs_vnops.c,v 1.168 2009/12/20 09:36:06 dsl Exp $");
__KERNEL_RCSID(0, "$NetBSD: vfs_vnops.c,v 1.169 2010/01/08 11:35:10 pooka Exp $");
#include "veriexec.h"
@ -170,7 +170,7 @@ vn_open(struct nameidata *ndp, int fmode, int cmode)
if (fmode & O_CREAT) {
if (ndp->ni_vp == NULL) {
VATTR_NULL(&va);
vattr_null(&va);
va.va_type = VREG;
va.va_mode = cmode;
if (fmode & O_EXCL)
@ -217,7 +217,7 @@ vn_open(struct nameidata *ndp, int fmode, int cmode)
VOP_UNLOCK(vp, 0); /* XXX */
vn_lock(vp, LK_EXCLUSIVE | LK_RETRY); /* XXX */
VATTR_NULL(&va);
vattr_null(&va);
va.va_size = 0;
error = VOP_SETATTR(vp, &va, cred);
if (error != 0)
@ -449,7 +449,7 @@ unionread:
(vp->v_mount->mnt_flag & MNT_UNION)) {
struct vnode *tvp = vp;
vp = vp->v_mount->mnt_vnodecovered;
VREF(vp);
vref(vp);
mutex_enter(&fp->f_lock);
fp->f_data = vp;
fp->f_offset = 0;
@ -682,7 +682,7 @@ vn_ioctl(file_t *fp, u_long com, void *data)
error = VOP_IOCTL(vp, com, data, fp->f_flag,
kauth_cred_get());
if (error == 0 && com == TIOCSCTTY) {
VREF(vp);
vref(vp);
mutex_enter(proc_lock);
ovp = curproc->p_session->s_ttyvp;
curproc->p_session->s_ttyvp = vp;

6
sys/miscfs/fdesc/fdesc_vfsops.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: fdesc_vfsops.c,v 1.83 2009/11/30 10:59:20 pooka Exp $ */
/* $NetBSD: fdesc_vfsops.c,v 1.84 2010/01/08 11:35:10 pooka Exp $ */
/*
* Copyright (c) 1992, 1993, 1995
@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: fdesc_vfsops.c,v 1.83 2009/11/30 10:59:20 pooka Exp $");
__KERNEL_RCSID(0, "$NetBSD: fdesc_vfsops.c,v 1.84 2010/01/08 11:35:10 pooka Exp $");
#if defined(_KERNEL_OPT)
#include "opt_compat_netbsd.h"
@ -147,7 +147,7 @@ fdesc_root(struct mount *mp, struct vnode **vpp)
* Return locked reference to root.
*/
vp = mp->mnt_data;
VREF(vp);
vref(vp);
vn_lock(vp, LK_EXCLUSIVE | LK_RETRY);
*vpp = vp;
return (0);

8
sys/miscfs/fdesc/fdesc_vnops.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: fdesc_vnops.c,v 1.108 2009/07/31 18:50:58 pooka Exp $ */
/* $NetBSD: fdesc_vnops.c,v 1.109 2010/01/08 11:35:10 pooka Exp $ */
/*
* Copyright (c) 1992, 1993
@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: fdesc_vnops.c,v 1.108 2009/07/31 18:50:58 pooka Exp $");
__KERNEL_RCSID(0, "$NetBSD: fdesc_vnops.c,v 1.109 2010/01/08 11:35:10 pooka Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -284,7 +284,7 @@ fdesc_lookup(void *v)
if (cnp->cn_namelen == 1 && *pname == '.') {
*vpp = dvp;
VREF(dvp);
vref(dvp);
return (0);
}
@ -516,7 +516,7 @@ fdesc_getattr(void *v)
case Fdevfd:
case Flink:
case Fctty:
VATTR_NULL(vap);
vattr_null(vap);
vap->va_fileid = VTOFDESC(vp)->fd_ix;
#define R_ALL (S_IRUSR|S_IRGRP|S_IROTH)

6
sys/miscfs/genfs/layer_subr.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: layer_subr.c,v 1.27 2009/03/15 17:22:38 cegger Exp $ */
/* $NetBSD: layer_subr.c,v 1.28 2010/01/08 11:35:10 pooka Exp $ */
/*
* Copyright (c) 1999 National Aeronautics & Space Administration
@ -68,7 +68,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: layer_subr.c,v 1.27 2009/03/15 17:22:38 cegger Exp $");
__KERNEL_RCSID(0, "$NetBSD: layer_subr.c,v 1.28 2010/01/08 11:35:10 pooka Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -269,7 +269,7 @@ layer_node_alloc(struct mount *mp, struct vnode *lowervp, struct vnode **vpp)
*/
*vpp = vp;
VREF(lowervp);
vref(lowervp);
hd = LAYER_NHASH(lmp, lowervp);
LIST_INSERT_HEAD(hd, xp, layer_hash);
uvm_vnp_setsize(vp, 0);

6
sys/miscfs/genfs/layer_vfsops.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: layer_vfsops.c,v 1.31 2009/03/14 15:36:22 dsl Exp $ */
/* $NetBSD: layer_vfsops.c,v 1.32 2010/01/08 11:35:10 pooka Exp $ */
/*
* Copyright (c) 1999 National Aeronautics & Space Administration
@ -73,7 +73,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: layer_vfsops.c,v 1.31 2009/03/14 15:36:22 dsl Exp $");
__KERNEL_RCSID(0, "$NetBSD: layer_vfsops.c,v 1.32 2010/01/08 11:35:10 pooka Exp $");
#include <sys/param.h>
#include <sys/sysctl.h>
@ -144,7 +144,7 @@ layerfs_root(struct mount *mp, struct vnode **vpp)
*vpp = NULL;
return (EINVAL);
}
VREF(vp);
vref(vp);
vn_lock(vp, LK_EXCLUSIVE | LK_RETRY);
*vpp = vp;
return 0;

8
sys/miscfs/genfs/layer_vnops.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: layer_vnops.c,v 1.38 2009/03/14 21:04:25 dsl Exp $ */
/* $NetBSD: layer_vnops.c,v 1.39 2010/01/08 11:35:10 pooka Exp $ */
/*
* Copyright (c) 1999 National Aeronautics & Space Administration
@ -232,7 +232,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: layer_vnops.c,v 1.38 2009/03/14 21:04:25 dsl Exp $");
__KERNEL_RCSID(0, "$NetBSD: layer_vnops.c,v 1.39 2010/01/08 11:35:10 pooka Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -346,7 +346,7 @@ layer_bypass(void *v)
* that. (This should go away in the future.)
*/
if (reles & VDESC_VP0_WILLRELE)
VREF(*this_vp_p);
vref(*this_vp_p);
}
}
@ -459,7 +459,7 @@ layer_lookup(void *v)
* or ".." in the root node of a mount point.
* So we make another reference to dvp and return it.
*/
VREF(dvp);
vref(dvp);
*ap->a_vpp = dvp;
vrele(lvp);
} else if (lvp != NULL) {

8
sys/miscfs/kernfs/kernfs_vnops.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: kernfs_vnops.c,v 1.138 2009/07/03 21:17:41 elad Exp $ */
/* $NetBSD: kernfs_vnops.c,v 1.139 2010/01/08 11:35:11 pooka Exp $ */
/*
* Copyright (c) 1992, 1993
@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: kernfs_vnops.c,v 1.138 2009/07/03 21:17:41 elad Exp $");
__KERNEL_RCSID(0, "$NetBSD: kernfs_vnops.c,v 1.139 2010/01/08 11:35:11 pooka Exp $");
#ifdef _KERNEL_OPT
#include "opt_ipsec.h"
@ -594,7 +594,7 @@ kernfs_lookup(void *v)
if (cnp->cn_namelen == 1 && *pname == '.') {
*vpp = dvp;
VREF(dvp);
vref(dvp);
return (0);
}
@ -832,7 +832,7 @@ kernfs_getattr(void *v)
char strbuf[KSTRING], *bf;
size_t nread, total;
VATTR_NULL(vap);
vattr_null(vap);
vap->va_type = ap->a_vp->v_type;
vap->va_uid = 0;
vap->va_gid = 0;

12
sys/miscfs/procfs/procfs_vnops.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: procfs_vnops.c,v 1.176 2009/07/03 21:17:42 elad Exp $ */
/* $NetBSD: procfs_vnops.c,v 1.177 2010/01/08 11:35:11 pooka Exp $ */
/*-
* Copyright (c) 2006, 2007, 2008 The NetBSD Foundation, Inc.
@ -105,7 +105,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: procfs_vnops.c,v 1.176 2009/07/03 21:17:42 elad Exp $");
__KERNEL_RCSID(0, "$NetBSD: procfs_vnops.c,v 1.177 2010/01/08 11:35:11 pooka Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -672,7 +672,7 @@ procfs_getattr(void *v)
error = 0;
/* start by zeroing out the attributes */
VATTR_NULL(vap);
vattr_null(vap);
/* next do all the common fields */
vap->va_type = ap->a_vp->v_type;
@ -1004,7 +1004,7 @@ procfs_lookup(void *v)
if (cnp->cn_namelen == 1 && *pname == '.') {
*vpp = dvp;
VREF(dvp);
vref(dvp);
return (0);
}
@ -1107,7 +1107,7 @@ procfs_lookup(void *v)
if (pt->pt_pfstype == PFSfile) {
fvp = p->p_textvp;
/* We already checked that it exists. */
VREF(fvp);
vref(fvp);
procfs_proc_unlock(p);
vn_lock(fvp, LK_EXCLUSIVE | LK_RETRY);
*vpp = fvp;
@ -1150,7 +1150,7 @@ procfs_lookup(void *v)
/* Don't show directories */
if (fp->f_type == DTYPE_VNODE && fvp->v_type != VDIR) {
VREF(fvp);
vref(fvp);
closef(fp);
procfs_proc_unlock(p);
vn_lock(fvp, LK_EXCLUSIVE | LK_RETRY |

8
sys/miscfs/umapfs/umap_vnops.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: umap_vnops.c,v 1.47 2009/03/14 21:04:25 dsl Exp $ */
/* $NetBSD: umap_vnops.c,v 1.48 2010/01/08 11:35:11 pooka Exp $ */
/*
* Copyright (c) 1992, 1993
@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: umap_vnops.c,v 1.47 2009/03/14 21:04:25 dsl Exp $");
__KERNEL_RCSID(0, "$NetBSD: umap_vnops.c,v 1.48 2010/01/08 11:35:11 pooka Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -179,7 +179,7 @@ umap_bypass(void *v)
* that. (This should go away in the future.)
*/
if (reles & VDESC_VP0_WILLRELE)
VREF(*this_vp_p);
vref(*this_vp_p);
}
}
@ -412,7 +412,7 @@ umap_lookup(void *v)
/* Do locking fixup as appropriate. See layer_lookup() for info */
if (ldvp == vp) {
*ap->a_vpp = dvp;
VREF(dvp);
vref(dvp);
vrele(vp);
} else if (vp != NULL) {
error = layer_node_create(mp, vp, ap->a_vpp);

20
sys/nfs/nfs_serv.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: nfs_serv.c,v 1.149 2009/12/23 01:09:25 pooka Exp $ */
/* $NetBSD: nfs_serv.c,v 1.150 2010/01/08 11:35:11 pooka Exp $ */
/*
* Copyright (c) 1989, 1993
@ -55,7 +55,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: nfs_serv.c,v 1.149 2009/12/23 01:09:25 pooka Exp $");
__KERNEL_RCSID(0, "$NetBSD: nfs_serv.c,v 1.150 2010/01/08 11:35:11 pooka Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -279,7 +279,7 @@ nfsrv_setattr(struct nfsrv_descript *nfsd, struct nfssvc_sock *slp, struct lwp *
memset(&guard, 0, sizeof guard); /* XXX gcc */
nfsm_srvmtofh(&nsfh);
VATTR_NULL(&va);
vattr_null(&va);
if (v3) {
nfsm_srvsattr(&va);
nfsm_dissect(tl, u_int32_t *, NFSX_UNSIGNED);
@ -428,7 +428,7 @@ nfsrv_lookup(struct nfsrv_descript *nfsd, struct nfssvc_sock *slp, struct lwp *l
ind.ni_cnd.cn_nameptr = ind.ni_cnd.cn_pnbuf =
nfs_pub.np_index;
ind.ni_startdir = nd.ni_vp;
VREF(ind.ni_startdir);
vref(ind.ni_startdir);
error = lookup_for_nfsd_index(&ind);
if (!error) {
/*
@ -1427,7 +1427,7 @@ nfsrv_create(struct nfsrv_descript *nfsd, struct nfssvc_sock *slp, struct lwp *l
return (0);
}
abort = 1;
VATTR_NULL(&va);
vattr_null(&va);
if (v3) {
va.va_mode = 0;
nfsm_dissect(tl, u_int32_t *, NFSX_UNSIGNED);
@ -1482,7 +1482,7 @@ nfsrv_create(struct nfsrv_descript *nfsd, struct nfssvc_sock *slp, struct lwp *l
if (!error) {
if (exclusive_flag) {
exclusive_flag = 0;
VATTR_NULL(&va);
vattr_null(&va);
/*
* XXX
* assuming NFSX_V3CREATEVERF
@ -1542,7 +1542,7 @@ nfsrv_create(struct nfsrv_descript *nfsd, struct nfssvc_sock *slp, struct lwp *l
if (!error) {
nqsrv_getl(vp, ND_WRITE);
tempsize = va.va_size;
VATTR_NULL(&va);
vattr_null(&va);
va.va_size = tempsize;
error = VOP_SETATTR(vp, &va, cred);
}
@ -1653,7 +1653,7 @@ nfsrv_mknod(struct nfsrv_descript *nfsd, struct nfssvc_sock *slp, struct lwp *lw
error = NFSERR_BADTYPE;
goto abort;
}
VATTR_NULL(&va);
vattr_null(&va);
va.va_mode = 0;
nfsm_srvsattr(&va);
if (vtyp == VCHR || vtyp == VBLK) {
@ -2209,7 +2209,7 @@ nfsrv_symlink(struct nfsrv_descript *nfsd, struct nfssvc_sock *slp, struct lwp *
if (error)
goto out;
abort = 1;
VATTR_NULL(&va);
vattr_null(&va);
va.va_type = VLNK;
if (v3) {
va.va_mode = 0;
@ -2347,7 +2347,7 @@ nfsrv_mkdir(struct nfsrv_descript *nfsd, struct nfssvc_sock *slp, struct lwp *lw
return (0);
}
abort = 1;
VATTR_NULL(&va);
vattr_null(&va);
if (v3) {
va.va_mode = 0;
nfsm_srvsattr(&va);

18
sys/nfs/nfs_vnops.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: nfs_vnops.c,v 1.281 2009/10/21 21:12:06 rmind Exp $ */
/* $NetBSD: nfs_vnops.c,v 1.282 2010/01/08 11:35:11 pooka Exp $ */
/*
* Copyright (c) 1989, 1993
@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: nfs_vnops.c,v 1.281 2009/10/21 21:12:06 rmind Exp $");
__KERNEL_RCSID(0, "$NetBSD: nfs_vnops.c,v 1.282 2010/01/08 11:35:11 pooka Exp $");
#ifdef _KERNEL_OPT
#include "opt_nfs.h"
@ -798,7 +798,7 @@ nfs_lookup(void *v)
return error;
if (cnp->cn_nameiop == RENAME && (flags & ISLASTCN))
return EISDIR;
VREF(dvp);
vref(dvp);
*vpp = dvp;
if (cnp->cn_nameiop != LOOKUP && (flags & ISLASTCN))
cnp->cn_flags |= SAVENAME;
@ -954,7 +954,7 @@ dorpc:
* as we handle "." lookup locally, this should be
* a broken server.
*/
VREF(dvp);
vref(dvp);
newvp = dvp;
#ifndef NFS_V2_ONLY
if (v3) {
@ -2797,7 +2797,7 @@ nfs_readdirplusrpc(struct vnode *vp, struct uio *uiop, kauth_cred_t cred)
if (doit) {
nfsm_getfh(fhp, fhsize, 1);
if (NFS_CMPFH(dnp, fhp, fhsize)) {
VREF(vp);
vref(vp);
newvp = vp;
np = dnp;
} else {
@ -2914,7 +2914,7 @@ nfs_sillyrename(struct vnode *dvp, struct vnode *vp, struct componentname *cnp,
sp = kmem_alloc(sizeof(*sp), KM_SLEEP);
sp->s_cred = kauth_cred_dup(cnp->cn_cred);
sp->s_dvp = dvp;
VREF(dvp);
vref(dvp);
/* Fudge together a funny name */
pid = curlwp->l_proc->p_pid;
@ -3006,7 +3006,7 @@ nfs_lookitup(struct vnode *dvp, const char *name, int len, kauth_cred_t cred, st
np->n_fhsize = fhlen;
newvp = NFSTOV(np);
} else if (NFS_CMPFH(dnp, nfhp, fhlen)) {
VREF(dvp);
vref(dvp);
newvp = dvp;
np = dnp;
} else {
@ -3472,7 +3472,7 @@ nfsspec_close(void *v)
np->n_flag |= NCHG;
if (vp->v_usecount == 1 &&
(vp->v_mount->mnt_flag & MNT_RDONLY) == 0) {
VATTR_NULL(&vattr);
vattr_null(&vattr);
if (np->n_flag & NACC)
vattr.va_atime = np->n_atim;
if (np->n_flag & NUPD)
@ -3556,7 +3556,7 @@ nfsfifo_close(void *v)
np->n_flag |= NCHG;
if (vp->v_usecount == 1 &&
(vp->v_mount->mnt_flag & MNT_RDONLY) == 0) {
VATTR_NULL(&vattr);
vattr_null(&vattr);
if (np->n_flag & NACC)
vattr.va_atime = np->n_atim;
if (np->n_flag & NUPD)

7
sys/sys/vnode.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: vnode.h,v 1.210 2009/10/06 04:28:10 elad Exp $ */
/* $NetBSD: vnode.h,v 1.211 2010/01/08 11:35:11 pooka Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@ -356,9 +356,6 @@ extern const int vttoif_tab[];
#define UPDATE_DIROP 0x0002 /* update: hint to fs to wait or not */
#define UPDATE_CLOSE 0x0004 /* update: clean up on close */
#define HOLDRELE(vp) holdrele(vp)
#define VHOLD(vp) vhold(vp)
#define VREF(vp) vref(vp)
extern kmutex_t vnode_free_list_lock;
void holdrelel(struct vnode *);
@ -368,8 +365,6 @@ void vref(struct vnode *);
static __inline void holdrele(struct vnode *) __unused;
static __inline void vhold(struct vnode *) __unused;
#define VATTR_NULL(vap) vattr_null(vap)
/*
* decrease buf or page ref
*/

8
sys/ufs/ext2fs/ext2fs_lookup.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ext2fs_lookup.c,v 1.60 2009/09/12 11:35:46 tsutsui Exp $ */
/* $NetBSD: ext2fs_lookup.c,v 1.61 2010/01/08 11:35:11 pooka Exp $ */
/*
* Modified for NetBSD 1.2E
@ -48,7 +48,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: ext2fs_lookup.c,v 1.60 2009/09/12 11:35:46 tsutsui Exp $");
__KERNEL_RCSID(0, "$NetBSD: ext2fs_lookup.c,v 1.61 2010/01/08 11:35:11 pooka Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -584,7 +584,7 @@ found:
else
dp->i_count = dp->i_offset - prevoff;
if (dp->i_number == foundino) {
VREF(vdp);
vref(vdp);
*vpp = vdp;
return (0);
}
@ -669,7 +669,7 @@ found:
}
*vpp = tdp;
} else if (dp->i_number == foundino) {
VREF(vdp); /* we want ourself, ie "." */
vref(vdp); /* we want ourself, ie "." */
*vpp = vdp;
} else {
error = VFS_VGET(vdp->v_mount, foundino, &tdp);

6
sys/ufs/ext2fs/ext2fs_vfsops.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ext2fs_vfsops.c,v 1.152 2009/10/21 17:37:21 pooka Exp $ */
/* $NetBSD: ext2fs_vfsops.c,v 1.153 2010/01/08 11:35:11 pooka Exp $ */
/*
* Copyright (c) 1989, 1991, 1993, 1994
@ -60,7 +60,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: ext2fs_vfsops.c,v 1.152 2009/10/21 17:37:21 pooka Exp $");
__KERNEL_RCSID(0, "$NetBSD: ext2fs_vfsops.c,v 1.153 2010/01/08 11:35:11 pooka Exp $");
#if defined(_KERNEL_OPT)
#include "opt_compat_netbsd.h"
@ -1106,7 +1106,7 @@ retry:
*/
ip->i_devvp = ump->um_devvp;
VREF(ip->i_devvp);
vref(ip->i_devvp);
/*
* Set up a generation number for this inode if it does not

6
sys/ufs/ffs/ffs_vfsops.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ffs_vfsops.c,v 1.253 2009/11/04 09:45:05 hannken Exp $ */
/* $NetBSD: ffs_vfsops.c,v 1.254 2010/01/08 11:35:11 pooka Exp $ */
/*-
* Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
@ -61,7 +61,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: ffs_vfsops.c,v 1.253 2009/11/04 09:45:05 hannken Exp $");
__KERNEL_RCSID(0, "$NetBSD: ffs_vfsops.c,v 1.254 2010/01/08 11:35:11 pooka Exp $");
#if defined(_KERNEL_OPT)
#include "opt_ffs.h"
@ -1820,7 +1820,7 @@ ffs_vget(struct mount *mp, ino_t ino, struct vnode **vpp)
*/
ip->i_devvp = ump->um_devvp;
VREF(ip->i_devvp);
vref(ip->i_devvp);
/*
* Ensure that uid and gid are correct. This is a temporary

6
sys/ufs/lfs/lfs_alloc.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: lfs_alloc.c,v 1.108 2009/09/13 05:17:37 tsutsui Exp $ */
/* $NetBSD: lfs_alloc.c,v 1.109 2010/01/08 11:35:12 pooka Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001, 2002, 2003, 2007 The NetBSD Foundation, Inc.
@ -60,7 +60,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: lfs_alloc.c,v 1.108 2009/09/13 05:17:37 tsutsui Exp $");
__KERNEL_RCSID(0, "$NetBSD: lfs_alloc.c,v 1.109 2010/01/08 11:35:12 pooka Exp $");
#if defined(_KERNEL_OPT)
#include "opt_quota.h"
@ -304,7 +304,7 @@ lfs_ialloc(struct lfs *fs, struct vnode *pvp, ino_t new_ino, int new_gen,
uvm_vnp_setsize(vp, 0);
lfs_mark_vnode(vp);
genfs_node_init(vp, &lfs_genfsops);
VREF(ip->i_devvp);
vref(ip->i_devvp);
return (0);
}

12
sys/ufs/lfs/lfs_bio.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: lfs_bio.c,v 1.115 2009/12/07 04:12:10 eeh Exp $ */
/* $NetBSD: lfs_bio.c,v 1.116 2010/01/08 11:35:12 pooka Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001, 2002, 2003, 2008 The NetBSD Foundation, Inc.
@ -60,7 +60,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: lfs_bio.c,v 1.115 2009/12/07 04:12:10 eeh Exp $");
__KERNEL_RCSID(0, "$NetBSD: lfs_bio.c,v 1.116 2010/01/08 11:35:12 pooka Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -318,9 +318,9 @@ lfs_reserve(struct lfs *fs, struct vnode *vp, struct vnode *vp2, int fsb)
* vref vnodes here so that cleaner doesn't try to reuse them.
* (see XXX comment in lfs_reserveavail)
*/
VHOLD(vp);
vhold(vp);
if (vp2 != NULL) {
VHOLD(vp2);
vhold(vp2);
}
error = lfs_reserveavail(fs, vp, vp2, fsb);
@ -336,9 +336,9 @@ lfs_reserve(struct lfs *fs, struct vnode *vp, struct vnode *vp2, int fsb)
lfs_reserveavail(fs, vp, vp2, -fsb);
done:
HOLDRELE(vp);
holdrele(vp);
if (vp2 != NULL) {
HOLDRELE(vp2);
holdrele(vp2);
}
return error;

8
sys/ufs/lfs/lfs_vfsops.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: lfs_vfsops.c,v 1.281 2009/12/07 04:12:10 eeh Exp $ */
/* $NetBSD: lfs_vfsops.c,v 1.282 2010/01/08 11:35:12 pooka Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001, 2002, 2003, 2007, 2007
@ -61,7 +61,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: lfs_vfsops.c,v 1.281 2009/12/07 04:12:10 eeh Exp $");
__KERNEL_RCSID(0, "$NetBSD: lfs_vfsops.c,v 1.282 2010/01/08 11:35:12 pooka Exp $");
#if defined(_KERNEL_OPT)
#include "opt_lfs.h"
@ -960,7 +960,7 @@ lfs_mountfs(struct vnode *devvp, struct mount *mp, struct lwp *l)
goto out;
}
fs->lfs_ivnode = vp;
VREF(vp);
vref(vp);
/* Set up inode bitmap and order free list */
lfs_order_freelist(fs);
@ -1912,7 +1912,7 @@ inconsistent:
*/
ip->i_devvp = ump->um_devvp;
VREF(ip->i_devvp);
vref(ip->i_devvp);
genfs_node_init(vp, &lfs_genfsops);
uvm_vnp_setsize(vp, ip->i_size);

8
sys/ufs/ufs/ufs_lookup.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ufs_lookup.c,v 1.102 2009/09/28 00:39:03 dholland Exp $ */
/* $NetBSD: ufs_lookup.c,v 1.103 2010/01/08 11:35:12 pooka Exp $ */
/*
* Copyright (c) 1989, 1993
@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: ufs_lookup.c,v 1.102 2009/09/28 00:39:03 dholland Exp $");
__KERNEL_RCSID(0, "$NetBSD: ufs_lookup.c,v 1.103 2010/01/08 11:35:12 pooka Exp $");
#ifdef _KERNEL_OPT
#include "opt_ffs.h"
@ -531,7 +531,7 @@ found:
else
dp->i_count = dp->i_offset - prevoff;
if (dp->i_number == foundino) {
VREF(vdp);
vref(vdp);
*vpp = vdp;
error = 0;
goto out;
@ -623,7 +623,7 @@ found:
}
*vpp = tdp;
} else if (dp->i_number == foundino) {
VREF(vdp); /* we want ourself, ie "." */
vref(vdp); /* we want ourself, ie "." */
*vpp = vdp;
} else {
error = VFS_VGET(vdp->v_mount, foundino, &tdp);

6
sys/uvm/uvm_vnode.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: uvm_vnode.c,v 1.92 2009/08/04 23:31:57 pooka Exp $ */
/* $NetBSD: uvm_vnode.c,v 1.93 2010/01/08 11:35:12 pooka Exp $ */
/*
* Copyright (c) 1997 Charles D. Cranor and Washington University.
@ -50,7 +50,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: uvm_vnode.c,v 1.92 2009/08/04 23:31:57 pooka Exp $");
__KERNEL_RCSID(0, "$NetBSD: uvm_vnode.c,v 1.93 2010/01/08 11:35:12 pooka Exp $");
#include "opt_uvmhist.h"
@ -114,7 +114,7 @@ const struct uvm_pagerops uvm_vnodeops = {
static void
uvn_reference(struct uvm_object *uobj)
{
VREF((struct vnode *)uobj);
vref((struct vnode *)uobj);
}