Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys The VATTR_NULL/VREF/VHOLD/HOLDRELE() macros lost their w...



details:   https://anonhg.NetBSD.org/src/rev/4559bbf99b46
branches:  trunk
changeset: 750612:4559bbf99b46
user:      pooka <pooka%NetBSD.org@localhost>
date:      Fri Jan 08 11:35:07 2010 +0000

description:
The VATTR_NULL/VREF/VHOLD/HOLDRELE() macros lost their will to live
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

diffstat:

 sys/compat/common/vfs_syscalls_43.c |   6 ++--
 sys/compat/irix/irix_mman.c         |   6 ++--
 sys/fs/adosfs/adlookup.c            |   6 ++--
 sys/fs/cd9660/cd9660_lookup.c       |   6 ++--
 sys/fs/cd9660/cd9660_vfsops.c       |   6 ++--
 sys/fs/filecorefs/filecore_lookup.c |   6 ++--
 sys/fs/filecorefs/filecore_vfsops.c |   6 ++--
 sys/fs/hfs/hfs_vfsops.c             |   6 ++--
 sys/fs/hfs/hfs_vnops.c              |   8 +++---
 sys/fs/msdosfs/msdosfs_denode.c     |   6 ++--
 sys/fs/msdosfs/msdosfs_lookup.c     |   8 +++---
 sys/fs/nilfs/nilfs_vnops.c          |   8 +++---
 sys/fs/ntfs/ntfs_subr.c             |   6 ++--
 sys/fs/ntfs/ntfs_vfsops.c           |   8 +++---
 sys/fs/ntfs/ntfs_vnops.c            |   6 ++--
 sys/fs/ptyfs/ptyfs_vfsops.c         |   6 ++--
 sys/fs/ptyfs/ptyfs_vnops.c          |   8 +++---
 sys/fs/smbfs/smbfs_vnops.c          |   6 ++--
 sys/fs/sysvbfs/sysvbfs_vnops.c      |   6 ++--
 sys/fs/tmpfs/tmpfs_vnops.c          |   8 +++---
 sys/fs/udf/udf_vnops.c              |   8 +++---
 sys/fs/union/union_subr.c           |  22 ++++++++++----------
 sys/fs/union/union_vfsops.c         |  10 ++++----
 sys/fs/union/union_vnops.c          |  34 ++++++++++++++++----------------
 sys/fs/unionfs/unionfs_subr.c       |   2 +-
 sys/kern/kern_acct.c                |   6 ++--
 sys/kern/kern_core.c                |   6 ++--
 sys/kern/kern_exec.c                |   6 ++--
 sys/kern/kern_fork.c                |   6 ++--
 sys/kern/tty_bsdpty.c               |   6 ++--
 sys/kern/uipc_usrreq.c              |   6 ++--
 sys/kern/vfs_cwd.c                  |  10 ++++----
 sys/kern/vfs_getcwd.c               |  12 +++++-----
 sys/kern/vfs_lookup.c               |  30 ++++++++++++++--------------
 sys/kern/vfs_subr.c                 |   8 +++---
 sys/kern/vfs_syscalls.c             |  38 ++++++++++++++++++------------------
 sys/kern/vfs_vnops.c                |  12 +++++-----
 sys/miscfs/fdesc/fdesc_vfsops.c     |   6 ++--
 sys/miscfs/fdesc/fdesc_vnops.c      |   8 +++---
 sys/miscfs/genfs/layer_subr.c       |   6 ++--
 sys/miscfs/genfs/layer_vfsops.c     |   6 ++--
 sys/miscfs/genfs/layer_vnops.c      |   8 +++---
 sys/miscfs/kernfs/kernfs_vnops.c    |   8 +++---
 sys/miscfs/procfs/procfs_vnops.c    |  12 +++++-----
 sys/miscfs/umapfs/umap_vnops.c      |   8 +++---
 sys/nfs/nfs_serv.c                  |  20 +++++++++---------
 sys/nfs/nfs_vnops.c                 |  18 ++++++++--------
 sys/sys/vnode.h                     |   7 +-----
 sys/ufs/ext2fs/ext2fs_lookup.c      |   8 +++---
 sys/ufs/ext2fs/ext2fs_vfsops.c      |   6 ++--
 sys/ufs/ffs/ffs_vfsops.c            |   6 ++--
 sys/ufs/lfs/lfs_alloc.c             |   6 ++--
 sys/ufs/lfs/lfs_bio.c               |  12 +++++-----
 sys/ufs/lfs/lfs_vfsops.c            |   8 +++---
 sys/ufs/ufs/ufs_lookup.c            |   8 +++---
 sys/uvm/uvm_vnode.c                 |   6 ++--
 56 files changed, 258 insertions(+), 263 deletions(-)

diffs (truncated from 2292 to 300 lines):

diff -r 36e5818aeae4 -r 4559bbf99b46 sys/compat/common/vfs_syscalls_43.c
--- a/sys/compat/common/vfs_syscalls_43.c       Fri Jan 08 10:53:31 2010 +0000
+++ b/sys/compat/common/vfs_syscalls_43.c       Fri Jan 08 11:35:07 2010 +0000
@@ -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 @@
            (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);
diff -r 36e5818aeae4 -r 4559bbf99b46 sys/compat/irix/irix_mman.c
--- a/sys/compat/irix/irix_mman.c       Fri Jan 08 10:53:31 2010 +0000
+++ b/sys/compat/irix/irix_mman.c       Fri Jan 08 11:35:07 2010 +0000
@@ -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 @@
                        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);
diff -r 36e5818aeae4 -r 4559bbf99b46 sys/fs/adosfs/adlookup.c
--- a/sys/fs/adosfs/adlookup.c  Fri Jan 08 10:53:31 2010 +0000
+++ b/sys/fs/adosfs/adlookup.c  Fri Jan 08 11:35:07 2010 +0000
@@ -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 @@
                nocache = 1;
        }
        if (vdp == *vpp)
-               VREF(vdp);
+               vref(vdp);
 found_lockdone:
        if ((cnp->cn_flags & MAKEENTRY) && nocache == 0)
                cache_enter(vdp, *vpp, cnp);
diff -r 36e5818aeae4 -r 4559bbf99b46 sys/fs/cd9660/cd9660_lookup.c
--- a/sys/fs/cd9660/cd9660_lookup.c     Fri Jan 08 10:53:31 2010 +0000
+++ b/sys/fs/cd9660/cd9660_lookup.c     Fri Jan 08 11:35:07 2010 +0000
@@ -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 @@
                        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,
diff -r 36e5818aeae4 -r 4559bbf99b46 sys/fs/cd9660/cd9660_vfsops.c
--- a/sys/fs/cd9660/cd9660_vfsops.c     Fri Jan 08 10:53:31 2010 +0000
+++ b/sys/fs/cd9660/cd9660_vfsops.c     Fri Jan 08 11:35:07 2010 +0000
@@ -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 @@
        } else
                bp = 0;
 
-       VREF(ip->i_devvp);
+       vref(ip->i_devvp);
 
        if (relocated) {
                /*
diff -r 36e5818aeae4 -r 4559bbf99b46 sys/fs/filecorefs/filecore_lookup.c
--- a/sys/fs/filecorefs/filecore_lookup.c       Fri Jan 08 10:53:31 2010 +0000
+++ b/sys/fs/filecorefs/filecore_lookup.c       Fri Jan 08 11:35:07 2010 +0000
@@ -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 @@
                }
                *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
diff -r 36e5818aeae4 -r 4559bbf99b46 sys/fs/filecorefs/filecore_vfsops.c
--- a/sys/fs/filecorefs/filecore_vfsops.c       Fri Jan 08 10:53:31 2010 +0000
+++ b/sys/fs/filecorefs/filecore_vfsops.c       Fri Jan 08 11:35:07 2010 +0000
@@ -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 @@
        ip->i_mnt = fcmp;
        ip->i_devvp = fcmp->fc_devvp;
        ip->i_diroff = 0;
-       VREF(ip->i_devvp);
+       vref(ip->i_devvp);
 
        /*
         * Setup type
diff -r 36e5818aeae4 -r 4559bbf99b46 sys/fs/hfs/hfs_vfsops.c
--- a/sys/fs/hfs/hfs_vfsops.c   Fri Jan 08 10:53:31 2010 +0000
+++ b/sys/fs/hfs/hfs_vfsops.c   Fri Jan 08 11:35:07 2010 +0000
@@ -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_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) {
diff -r 36e5818aeae4 -r 4559bbf99b46 sys/fs/hfs/hfs_vnops.c
--- a/sys/fs/hfs/hfs_vnops.c    Fri Jan 08 10:53:31 2010 +0000
+++ b/sys/fs/hfs/hfs_vnops.c    Fri Jan 08 11:35:07 2010 +0000
@@ -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 @@
 
 /*     if (cnp->cn_namelen == 1 && *pname == '.') {
                *vpp = vdp;
-               VREF(vdp);
+               vref(vdp);
                return (0);
        }*/
        
@@ -394,7 +394,7 @@
 /*     } 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;
diff -r 36e5818aeae4 -r 4559bbf99b46 sys/fs/msdosfs/msdosfs_denode.c
--- a/sys/fs/msdosfs/msdosfs_denode.c   Fri Jan 08 10:53:31 2010 +0000
+++ b/sys/fs/msdosfs/msdosfs_denode.c   Fri Jan 08 11:35:07 2010 +0000
@@ -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 @@
                }
        } else
                nvp->v_type = VREG;
-       VREF(ldep->de_devvp);
+       vref(ldep->de_devvp);
        *depp = ldep;
        uvm_vnp_setsize(nvp, ldep->de_FileSize);
        return (0);
diff -r 36e5818aeae4 -r 4559bbf99b46 sys/fs/msdosfs/msdosfs_lookup.c
--- a/sys/fs/msdosfs/msdosfs_lookup.c   Fri Jan 08 10:53:31 2010 +0000
+++ b/sys/fs/msdosfs/msdosfs_lookup.c   Fri Jan 08 11:35:07 2010 +0000
@@ -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 @@
                 * Save directory inode pointer in ndp->ni_dvp for dirremove().
                 */



Home | Main Index | Thread Index | Old Index