These two have been pet peeves of mine for some time and I think
they are ripe for the attic.
VATTR_NULL -> vattr_null;
NULLVP -> NULL;
Note, I left the regres for diff alone, there no need to change it.
Comments/OKs?
Index: share/man/man9/getdevvp.9
===================================================================
RCS file: /home/cvs/src/share/man/man9/getdevvp.9,v
retrieving revision 1.7
diff -u -p -r1.7 getdevvp.9
--- share/man/man9/getdevvp.9 31 May 2007 19:20:00 -0000 1.7
+++ share/man/man9/getdevvp.9 9 Sep 2010 11:36:48 -0000
@@ -80,7 +80,7 @@ and swap areas, among other things.
will create a vnode for a character device and is used in console handling.
.Sh RETURN VALUES
All functions return 0 on success.
-If an error occurs, vpp will point to a NULLVP.
+If an error occurs, vpp will point to a NULL.
See
.Xr getnewvnode 9
for further return values.
Index: sys/compat/common/compat_exec.c
===================================================================
RCS file: /home/cvs/src/sys/compat/common/compat_exec.c,v
retrieving revision 1.7
diff -u -p -r1.7 compat_exec.c
--- sys/compat/common/compat_exec.c 15 Nov 2001 06:22:29 -0000 1.7
+++ sys/compat/common/compat_exec.c 9 Sep 2010 12:04:19 -0000
@@ -90,7 +90,7 @@ exec_aout_prep_oldzmagic(p, epp)
/* set up command for bss segment */
NEW_VMCMD(&epp->ep_vmcmds, vmcmd_map_zero, execp->a_bss,
- epp->ep_daddr + execp->a_data, NULLVP, 0,
+ epp->ep_daddr + execp->a_data, NULL, 0,
VM_PROT_READ|VM_PROT_WRITE|VM_PROT_EXECUTE);
return exec_setup_stack(p, epp);
@@ -135,7 +135,7 @@ exec_aout_prep_oldnmagic(p, epp)
bsize = epp->ep_daddr + epp->ep_dsize - baddr;
if (bsize > 0)
NEW_VMCMD(&epp->ep_vmcmds, vmcmd_map_zero, bsize, baddr,
- NULLVP, 0, VM_PROT_READ|VM_PROT_WRITE|VM_PROT_EXECUTE);
+ NULL, 0, VM_PROT_READ|VM_PROT_WRITE|VM_PROT_EXECUTE);
return exec_setup_stack(p, epp);
}
@@ -174,7 +174,7 @@ exec_aout_prep_oldomagic(p, epp)
bsize = epp->ep_daddr + epp->ep_dsize - baddr;
if (bsize > 0)
NEW_VMCMD(&epp->ep_vmcmds, vmcmd_map_zero, bsize, baddr,
- NULLVP, 0, VM_PROT_READ|VM_PROT_WRITE|VM_PROT_EXECUTE);
+ NULL, 0, VM_PROT_READ|VM_PROT_WRITE|VM_PROT_EXECUTE);
/*
* Make sure (# of pages) mapped above equals (vm_tsize + vm_dsize);
Index: sys/compat/linux/linux_exec.c
===================================================================
RCS file: /home/cvs/src/sys/compat/linux/linux_exec.c,v
retrieving revision 1.31
diff -u -p -r1.31 linux_exec.c
--- sys/compat/linux/linux_exec.c 5 Mar 2009 19:52:24 -0000 1.31
+++ sys/compat/linux/linux_exec.c 9 Sep 2010 12:04:19 -0000
@@ -323,7 +323,7 @@ exec_linux_aout_prep_zmagic(p, epp)
/* set up command for bss segment */
NEW_VMCMD(&epp->ep_vmcmds, vmcmd_map_zero, execp->a_bss,
- epp->ep_daddr + execp->a_data, NULLVP, 0,
+ epp->ep_daddr + execp->a_data, NULL, 0,
VM_PROT_READ|VM_PROT_WRITE|VM_PROT_EXECUTE);
return (exec_setup_stack(p, epp));
@@ -363,7 +363,7 @@ exec_linux_aout_prep_nmagic(p, epp)
bsize = epp->ep_daddr + epp->ep_dsize - baddr;
if (bsize > 0)
NEW_VMCMD(&epp->ep_vmcmds, vmcmd_map_zero, bsize, baddr,
- NULLVP, 0, VM_PROT_READ|VM_PROT_WRITE|VM_PROT_EXECUTE);
+ NULL, 0, VM_PROT_READ|VM_PROT_WRITE|VM_PROT_EXECUTE);
return (exec_setup_stack(p, epp));
}
@@ -397,7 +397,7 @@ exec_linux_aout_prep_omagic(p, epp)
bsize = epp->ep_daddr + epp->ep_dsize - baddr;
if (bsize > 0)
NEW_VMCMD(&epp->ep_vmcmds, vmcmd_map_zero, bsize, baddr,
- NULLVP, 0, VM_PROT_READ|VM_PROT_WRITE|VM_PROT_EXECUTE);
+ NULL, 0, VM_PROT_READ|VM_PROT_WRITE|VM_PROT_EXECUTE);
/*
* Make sure (# of pages) mapped above equals (vm_tsize + vm_dsize);
@@ -452,7 +452,7 @@ exec_linux_aout_prep_qmagic(p, epp)
/* set up command for bss segment */
NEW_VMCMD(&epp->ep_vmcmds, vmcmd_map_zero, execp->a_bss,
- epp->ep_daddr + execp->a_data, NULLVP, 0,
+ epp->ep_daddr + execp->a_data, NULL, 0,
VM_PROT_READ|VM_PROT_WRITE|VM_PROT_EXECUTE);
return (exec_setup_stack(p, epp));
@@ -600,7 +600,7 @@ linux_sys_uselib(p, v, retval)
bsize = daddr + dsize - baddr;
if (bsize > 0) {
NEW_VMCMD(&vcset, vmcmd_map_zero, bsize, baddr,
- NULLVP, 0, VM_PROT_READ|VM_PROT_WRITE|VM_PROT_EXECUTE);
+ NULL, 0, VM_PROT_READ|VM_PROT_WRITE|VM_PROT_EXECUTE);
}
for (i = 0; i < vcset.evs_used && !error; i++) {
Index: sys/compat/vax1k/vax1k_exec.c
===================================================================
RCS file: /home/cvs/src/sys/compat/vax1k/vax1k_exec.c,v
retrieving revision 1.2
diff -u -p -r1.2 vax1k_exec.c
--- sys/compat/vax1k/vax1k_exec.c 14 Mar 2002 01:26:51 -0000 1.2
+++ sys/compat/vax1k/vax1k_exec.c 9 Sep 2010 12:04:19 -0000
@@ -137,7 +137,7 @@ exec_vax1k_prep_anymagic(p, epp, off)
/* set up command for bss segment */
if (etmp > 0)
- NEW_VMCMD(&epp->ep_vmcmds, vmcmd_map_zero, etmp, tmp, NULLVP, 0,
+ NEW_VMCMD(&epp->ep_vmcmds, vmcmd_map_zero, etmp, tmp, NULL, 0,
VM_PROT_READ|VM_PROT_WRITE|VM_PROT_EXECUTE);
return exec_setup_stack(p, epp);
Index: sys/dev/cons.c
===================================================================
RCS file: /home/cvs/src/sys/dev/cons.c,v
retrieving revision 1.20
diff -u -p -r1.20 cons.c
--- sys/dev/cons.c 26 Jun 2010 23:24:44 -0000 1.20
+++ sys/dev/cons.c 9 Sep 2010 12:04:19 -0000
@@ -76,7 +76,7 @@ cnopen(dev_t dev, int flag, int mode, st
if (cndev == dev)
panic("cnopen: recursive");
#endif
- if (cn_devvp == NULLVP) {
+ if (cn_devvp == NULL) {
/* try to get a reference on its vnode, but fail silently */
cdevvp(cndev, &cn_devvp);
}
@@ -97,10 +97,10 @@ cnclose(dev_t dev, int flag, int mode, s
* screw up others who have it open.
*/
dev = cn_tab->cn_dev;
- if (cn_devvp != NULLVP) {
+ if (cn_devvp != NULL) {
/* release our reference to real dev's vnode */
vrele(cn_devvp);
- cn_devvp = NULLVP;
+ cn_devvp = NULL;
}
if (vfinddev(dev, VCHR, &vp) && vcount(vp))
return (0);
Index: sys/isofs/cd9660/cd9660_vfsops.c
===================================================================
RCS file: /home/cvs/src/sys/isofs/cd9660/cd9660_vfsops.c,v
retrieving revision 1.54
diff -u -p -r1.54 cd9660_vfsops.c
--- sys/isofs/cd9660/cd9660_vfsops.c 6 Sep 2010 23:44:10 -0000 1.54
+++ sys/isofs/cd9660/cd9660_vfsops.c 9 Sep 2010 12:04:19 -0000
@@ -573,7 +573,7 @@ cd9660_unmount(mp, mntflags, p)
if (mntinvalbuf(mp))
return (EBUSY);
#endif
- if ((error = vflush(mp, NULLVP, flags)) != 0)
+ if ((error = vflush(mp, NULL, flags)) != 0)
return (error);
isomp = VFSTOISOFS(mp);
@@ -708,13 +708,13 @@ cd9660_fhtovp(mp, fhp, vpp)
#endif
if ((error = VFS_VGET(mp, ifhp->ifid_ino, &nvp)) != 0) {
- *vpp = NULLVP;
+ *vpp = NULL;
return (error);
}
ip = VTOI(nvp);
if (ip->inode.iso_mode == 0) {
vput(nvp);
- *vpp = NULLVP;
+ *vpp = NULL;
return (ESTALE);
}
*vpp = nvp;
@@ -761,12 +761,12 @@ cd9660_vget_internal(mp, ino, vpp, reloc
retry:
imp = VFSTOISOFS(mp);
dev = imp->im_dev;
- if ((*vpp = cd9660_ihashget(dev, ino)) != NULLVP)
+ if ((*vpp = cd9660_ihashget(dev, ino)) != NULL)
return (0);
/* Allocate a new vnode/iso_node. */
if ((error = getnewvnode(VT_ISOFS, mp, &cd9660_vops, &vp)) != 0) {
- *vpp = NULLVP;
+ *vpp = NULL;
return (error);
}
ip = malloc(sizeof(*ip), M_ISOFSNODE, M_WAITOK | M_ZERO);
Index: sys/isofs/udf/udf_vfsops.c
===================================================================
RCS file: /home/cvs/src/sys/isofs/udf/udf_vfsops.c,v
retrieving revision 1.34
diff -u -p -r1.34 udf_vfsops.c
--- sys/isofs/udf/udf_vfsops.c 6 Sep 2010 23:44:10 -0000 1.34
+++ sys/isofs/udf/udf_vfsops.c 9 Sep 2010 12:04:19 -0000
@@ -717,7 +717,7 @@ udf_fhtovp(struct mount *mp, struct fid
ifhp = (struct ifid *)fhp;
if ((error = VFS_VGET(mp, ifhp->ifid_ino, &nvp)) != 0) {
- *vpp = NULLVP;
+ *vpp = NULL;
return (error);
}
Index: sys/kern/exec_aout.c
===================================================================
RCS file: /home/cvs/src/sys/kern/exec_aout.c,v
retrieving revision 1.10
diff -u -p -r1.10 exec_aout.c
--- sys/kern/exec_aout.c 12 Nov 2005 04:31:24 -0000 1.10
+++ sys/kern/exec_aout.c 9 Sep 2010 12:04:19 -0000
@@ -144,7 +144,7 @@ exec_aout_prep_zmagic(struct proc *p, st
/* set up command for bss segment */
NEW_VMCMD(&epp->ep_vmcmds, vmcmd_map_zero, execp->a_bss,
- epp->ep_daddr + execp->a_data, NULLVP, 0,
+ epp->ep_daddr + execp->a_data, NULL, 0,
VM_PROT_READ|VM_PROT_WRITE);
return exec_setup_stack(p, epp);
@@ -181,7 +181,7 @@ exec_aout_prep_nmagic(struct proc *p, st
bsize = epp->ep_daddr + epp->ep_dsize - baddr;
if (bsize > 0)
NEW_VMCMD(&epp->ep_vmcmds, vmcmd_map_zero, bsize, baddr,
- NULLVP, 0, VM_PROT_READ|VM_PROT_WRITE);
+ NULL, 0, VM_PROT_READ|VM_PROT_WRITE);
return exec_setup_stack(p, epp);
}
@@ -212,7 +212,7 @@ exec_aout_prep_omagic(struct proc *p, st
bsize = epp->ep_daddr + epp->ep_dsize - baddr;
if (bsize > 0)
NEW_VMCMD(&epp->ep_vmcmds, vmcmd_map_zero, bsize, baddr,
- NULLVP, 0, VM_PROT_READ|VM_PROT_WRITE);
+ NULL, 0, VM_PROT_READ|VM_PROT_WRITE);
/*
* Make sure (# of pages) mapped above equals (vm_tsize + vm_dsize);
Index: sys/kern/exec_ecoff.c
===================================================================
RCS file: /home/cvs/src/sys/kern/exec_ecoff.c,v
retrieving revision 1.10
diff -u -p -r1.10 exec_ecoff.c
--- sys/kern/exec_ecoff.c 12 Nov 2005 04:31:24 -0000 1.10
+++ sys/kern/exec_ecoff.c 9 Sep 2010 12:04:19 -0000
@@ -115,7 +115,7 @@ exec_ecoff_prep_omagic(struct proc *p, s
/* set up command for bss segment */
if (eap->bsize > 0)
NEW_VMCMD(&epp->ep_vmcmds, vmcmd_map_zero, eap->bsize,
- ECOFF_SEGMENT_ALIGN(execp, eap->bss_start), NULLVP, 0,
+ ECOFF_SEGMENT_ALIGN(execp, eap->bss_start), NULL, 0,
VM_PROT_READ|VM_PROT_WRITE|VM_PROT_EXECUTE);
return exec_setup_stack(p, epp);
@@ -150,7 +150,7 @@ exec_ecoff_prep_nmagic(struct proc *p, s
/* set up command for bss segment */
if (eap->bsize > 0)
NEW_VMCMD(&epp->ep_vmcmds, vmcmd_map_zero, eap->bsize,
- ECOFF_SEGMENT_ALIGN(execp, eap->bss_start), NULLVP, 0,
+ ECOFF_SEGMENT_ALIGN(execp, eap->bss_start), NULL, 0,
VM_PROT_READ|VM_PROT_WRITE|VM_PROT_EXECUTE);
return exec_setup_stack(p, epp);
@@ -204,7 +204,7 @@ exec_ecoff_prep_zmagic(struct proc *p, s
/* set up command for bss segment */
NEW_VMCMD(&epp->ep_vmcmds, vmcmd_map_zero, eap->bsize,
- ECOFF_SEGMENT_ALIGN(execp, eap->bss_start), NULLVP, 0,
+ ECOFF_SEGMENT_ALIGN(execp, eap->bss_start), NULL, 0,
VM_PROT_READ|VM_PROT_WRITE|VM_PROT_EXECUTE);
return exec_setup_stack(p, epp);
Index: sys/kern/exec_elf.c
===================================================================
RCS file: /home/cvs/src/sys/kern/exec_elf.c,v
retrieving revision 1.76
diff -u -p -r1.76 exec_elf.c
--- sys/kern/exec_elf.c 26 Jul 2010 01:56:27 -0000 1.76
+++ sys/kern/exec_elf.c 9 Sep 2010 12:04:19 -0000
@@ -290,7 +290,7 @@ ELFNAME(load_psection)(struct exec_vmcmd
rf = round_page(*addr + ph->p_filesz + diff);
if (rm != rf) {
- NEW_VMCMD2(vcset, vmcmd_map_zero, rm - rf, rf, NULLVP, 0,
+ NEW_VMCMD2(vcset, vmcmd_map_zero, rm - rf, rf, NULL, 0,
*prot, flags);
}
*size = msize;
Index: sys/kern/exec_subr.c
===================================================================
RCS file: /home/cvs/src/sys/kern/exec_subr.c,v
retrieving revision 1.28
diff -u -p -r1.28 exec_subr.c
--- sys/kern/exec_subr.c 14 Nov 2006 18:00:27 -0000 1.28
+++ sys/kern/exec_subr.c 9 Sep 2010 12:04:19 -0000
@@ -114,7 +114,7 @@ kill_vmcmds(struct exec_vmcmd_set *evsp)
for (i = 0; i < evsp->evs_used; i++) {
vcp = &evsp->evs_cmds[i];
- if (vcp->ev_vp != NULLVP)
+ if (vcp->ev_vp != NULL)
vrele(vcp->ev_vp);
}
@@ -341,16 +341,16 @@ exec_setup_stack(p, epp)
#ifdef MACHINE_STACK_GROWS_UP
NEW_VMCMD(&epp->ep_vmcmds, vmcmd_map_zero,
((epp->ep_minsaddr - epp->ep_ssize) - epp->ep_maxsaddr),
- epp->ep_maxsaddr + epp->ep_ssize, NULLVP, 0, VM_PROT_NONE);
+ epp->ep_maxsaddr + epp->ep_ssize, NULL, 0, VM_PROT_NONE);
NEW_VMCMD(&epp->ep_vmcmds, vmcmd_map_zero, epp->ep_ssize,
- epp->ep_maxsaddr, NULLVP, 0,
+ epp->ep_maxsaddr, NULL, 0,
VM_PROT_READ|VM_PROT_WRITE);
#else
NEW_VMCMD(&epp->ep_vmcmds, vmcmd_map_zero,
((epp->ep_minsaddr - epp->ep_ssize) - epp->ep_maxsaddr),
- epp->ep_maxsaddr, NULLVP, 0, VM_PROT_NONE);
+ epp->ep_maxsaddr, NULL, 0, VM_PROT_NONE);
NEW_VMCMD(&epp->ep_vmcmds, vmcmd_map_zero, epp->ep_ssize,
- (epp->ep_minsaddr - epp->ep_ssize), NULLVP, 0,
+ (epp->ep_minsaddr - epp->ep_ssize), NULL, 0,
VM_PROT_READ|VM_PROT_WRITE);
#endif
Index: sys/kern/kern_sig.c
===================================================================
RCS file: /home/cvs/src/sys/kern/kern_sig.c,v
retrieving revision 1.116
diff -u -p -r1.116 kern_sig.c
--- sys/kern/kern_sig.c 26 Jul 2010 01:56:27 -0000 1.116
+++ sys/kern/kern_sig.c 9 Sep 2010 12:04:19 -0000
@@ -1441,7 +1441,7 @@ coredump(struct proc *p)
error = EACCES;
goto out;
}
- VATTR_NULL(&vattr);
+ vattr_null(&vattr);
vattr.va_size = 0;
VOP_SETATTR(vp, &vattr, cred, p);
p->p_acflag |= ACORE;
Index: sys/kern/tty_pty.c
===================================================================
RCS file: /home/cvs/src/sys/kern/tty_pty.c,v
retrieving revision 1.51
diff -u -p -r1.51 tty_pty.c
--- sys/kern/tty_pty.c 6 Aug 2010 00:00:41 -0000 1.51
+++ sys/kern/tty_pty.c 9 Sep 2010 12:04:19 -0000
@@ -1029,7 +1029,7 @@ ptm_vn_open(struct nameidata *ndp)
error = VOP_OPEN(vp, FREAD|FWRITE, cred, p);
if (!error) {
/* update atime/mtime */
- VATTR_NULL(&vattr);
+ vattr_null(&vattr);
getnanotime(&vattr.va_atime);
vattr.va_mtime = vattr.va_atime;
vattr.va_vaflags |= VA_UTIMES_NULL;
@@ -1149,7 +1149,7 @@ retry:
/* get real uid */
uid = p->p_cred->p_ruid;
- VATTR_NULL(&vattr);
+ vattr_null(&vattr);
vattr.va_uid = uid;
vattr.va_gid = gid;
vattr.va_mode = (S_IRUSR|S_IWUSR|S_IWGRP) & ALLPERMS;
Index: sys/kern/uipc_usrreq.c
===================================================================
RCS file: /home/cvs/src/sys/kern/uipc_usrreq.c,v
retrieving revision 1.48
diff -u -p -r1.48 uipc_usrreq.c
--- sys/kern/uipc_usrreq.c 2 Jul 2010 00:11:39 -0000 1.48
+++ sys/kern/uipc_usrreq.c 9 Sep 2010 12:04:19 -0000
@@ -421,7 +421,7 @@ unp_bind(struct unpcb *unp, struct mbuf
vrele(vp);
return (EADDRINUSE);
}
- VATTR_NULL(&vattr);
+ vattr_null(&vattr);
vattr.va_type = VSOCK;
vattr.va_mode = ACCESSPERMS &~ p->p_fd->fd_cmask;
error = VOP_CREATE(nd.ni_dvp, &nd.ni_vp, &nd.ni_cnd, &vattr);
Index: sys/kern/vfs_lookup.c
===================================================================
RCS file: /home/cvs/src/sys/kern/vfs_lookup.c,v
retrieving revision 1.43
diff -u -p -r1.43 vfs_lookup.c
--- sys/kern/vfs_lookup.c 9 Sep 2010 10:37:03 -0000 1.43
+++ sys/kern/vfs_lookup.c 9 Sep 2010 12:04:22 -0000
@@ -319,7 +319,7 @@ vfs_lookup(struct nameidata *ndp)
ndp->ni_dvp = NULL;
cnp->cn_flags &= ~ISSYMLINK;
dp = ndp->ni_startdir;
- ndp->ni_startdir = NULLVP;
+ ndp->ni_startdir = NULL;
vn_lock(dp, LK_EXCLUSIVE | LK_RETRY, p);
/*
Index: sys/kern/vfs_subr.c
===================================================================
RCS file: /home/cvs/src/sys/kern/vfs_subr.c,v
retrieving revision 1.190
diff -u -p -r1.190 vfs_subr.c
--- sys/kern/vfs_subr.c 6 Sep 2010 23:44:10 -0000 1.190
+++ sys/kern/vfs_subr.c 9 Sep 2010 12:04:19 -0000
@@ -221,7 +221,7 @@ vfs_rootmountalloc(char *fstypename, cha
mp->mnt_vfc = vfsp;
mp->mnt_op = vfsp->vfc_vfsops;
mp->mnt_flag = MNT_RDONLY;
- mp->mnt_vnodecovered = NULLVP;
+ mp->mnt_vnodecovered = NULL;
vfsp->vfc_refcount++;
mp->mnt_flag |= vfsp->vfc_flags & MNT_VISFLAGMASK;
strncpy(mp->mnt_stat.f_fstypename, vfsp->vfc_name, MFSNAMELEN);
@@ -353,7 +353,7 @@ getnewvnode(enum vtagtype tag, struct mo
TAILQ_INIT(&vp->v_cache_dst);
numvnodes++;
} else {
- for (vp = TAILQ_FIRST(listhd); vp != NULLVP;
+ for (vp = TAILQ_FIRST(listhd); vp != NULL;
vp = TAILQ_NEXT(vp, v_freelist)) {
if (VOP_ISLOCKED(vp) == 0)
break;
@@ -460,12 +460,12 @@ getdevvp(dev_t dev, struct vnode **vpp,
int error;
if (dev == NODEV) {
- *vpp = NULLVP;
+ *vpp = NULL;
return (0);
}
error = getnewvnode(VT_NON, NULL, &spec_vops, &nvp);
if (error) {
- *vpp = NULLVP;
+ *vpp = NULL;
return (error);
}
vp = nvp;
@@ -494,7 +494,7 @@ checkalias(struct vnode *nvp, dev_t nvp_
struct vnode **vpp;
if (nvp->v_type != VBLK && nvp->v_type != VCHR)
- return (NULLVP);
+ return (NULL);
vpp = &speclisth[SPECHASH(nvp_rdev)];
loop:
@@ -528,12 +528,12 @@ loop:
nvp->v_speclockf = NULL;
bzero(nvp->v_specbitmap, sizeof(nvp->v_specbitmap));
*vpp = nvp;
- if (vp != NULLVP) {
+ if (vp != NULL) {
nvp->v_flag |= VALIASED;
vp->v_flag |= VALIASED;
vput(vp);
}
- return (NULLVP);
+ return (NULL);
}
/*
Index: sys/kern/vfs_syscalls.c
===================================================================
RCS file: /home/cvs/src/sys/kern/vfs_syscalls.c,v
retrieving revision 1.163
diff -u -p -r1.163 vfs_syscalls.c
--- sys/kern/vfs_syscalls.c 1 Jul 2010 22:03:32 -0000 1.163
+++ sys/kern/vfs_syscalls.c 9 Sep 2010 12:04:19 -0000
@@ -423,7 +423,7 @@ dounmount(struct mount *mp, int flags, s
}
CIRCLEQ_REMOVE(&mountlist, mp, mnt_list);
- if ((coveredvp = mp->mnt_vnodecovered) != NULLVP) {
+ if ((coveredvp = mp->mnt_vnodecovered) != NULL) {
coveredvp->v_mountedhere = NULL;
vrele(coveredvp);
}
@@ -869,7 +869,7 @@ sys_open(struct proc *p, void *v, regist
else if (vp->v_type == VDIR)
error = EISDIR;
else if ((error = vn_writechk(vp)) == 0) {
- VATTR_NULL(&vattr);
+ vattr_null(&vattr);
vattr.va_size = 0;
error = VOP_SETATTR(vp, &vattr, fp->f_cred, p);
}
@@ -1001,7 +1001,7 @@ sys_fhopen(struct proc *p, void *v, regi
goto bad;
}
if (flags & O_TRUNC) {
- VATTR_NULL(&va);
+ vattr_null(&va);
va.va_size = 0;
if ((error = VOP_SETATTR(vp, &va, cred, p)) != 0)
goto bad;
@@ -1154,7 +1154,7 @@ sys_mknod(struct proc *p, void *v, regis
if (vp != NULL)
error = EEXIST;
else {
- VATTR_NULL(&vattr);
+ vattr_null(&vattr);
vattr.va_mode = (SCARG(uap, mode) & ALLPERMS) &~
p->p_fd->fd_cmask;
vattr.va_rdev = SCARG(uap, dev);
@@ -1217,7 +1217,7 @@ sys_mkfifo(struct proc *p, void *v, regi
vrele(nd.ni_vp);
return (EEXIST);
}
- VATTR_NULL(&vattr);
+ vattr_null(&vattr);
vattr.va_type = VFIFO;
vattr.va_mode = (SCARG(uap, mode) & ALLPERMS) &~ p->p_fd->fd_cmask;
return (VOP_MKNOD(nd.ni_dvp, &nd.ni_vp, &nd.ni_cnd, &vattr));
@@ -1302,7 +1302,7 @@ sys_symlink(struct proc *p, void *v, reg
error = EEXIST;
goto out;
}
- VATTR_NULL(&vattr);
+ vattr_null(&vattr);
vattr.va_mode = ACCESSPERMS &~ p->p_fd->fd_cmask;
error = VOP_SYMLINK(nd.ni_dvp, &nd.ni_vp, &nd.ni_cnd, &vattr, path);
out:
@@ -1632,7 +1632,7 @@ sys_chflags(struct proc *p, void *v, reg
goto out;
}
}
- VATTR_NULL(&vattr);
+ vattr_null(&vattr);
vattr.va_flags = flags;
error = VOP_SETATTR(vp, &vattr, p->p_ucred, p);
}
@@ -1676,7 +1676,7 @@ sys_fchflags(struct proc *p, void *v, re
goto out;
}
}
- VATTR_NULL(&vattr);
+ vattr_null(&vattr);
vattr.va_flags = flags;
error = VOP_SETATTR(vp, &vattr, p->p_ucred, p);
}
@@ -1713,7 +1713,7 @@ sys_chmod(struct proc *p, void *v, regis
if (vp->v_mount->mnt_flag & MNT_RDONLY)
error = EROFS;
else {
- VATTR_NULL(&vattr);
+ vattr_null(&vattr);
vattr.va_mode = SCARG(uap, mode) & ALLPERMS;
error = VOP_SETATTR(vp, &vattr, p->p_ucred, p);
}
@@ -1747,7 +1747,7 @@ sys_fchmod(struct proc *p, void *v, regi
if (vp->v_mount && vp->v_mount->mnt_flag & MNT_RDONLY)
error = EROFS;
else {
- VATTR_NULL(&vattr);
+ vattr_null(&vattr);
vattr.va_mode = SCARG(uap, mode) & ALLPERMS;
error = VOP_SETATTR(vp, &vattr, p->p_ucred, p);
}
@@ -1795,7 +1795,7 @@ sys_chown(struct proc *p, void *v, regis
}
else
mode = VNOVAL;
- VATTR_NULL(&vattr);
+ vattr_null(&vattr);
vattr.va_uid = uid;
vattr.va_gid = gid;
vattr.va_mode = mode;
@@ -1845,7 +1845,7 @@ sys_lchown(struct proc *p, void *v, regi
}
else
mode = VNOVAL;
- VATTR_NULL(&vattr);
+ vattr_null(&vattr);
vattr.va_uid = uid;
vattr.va_gid = gid;
vattr.va_mode = mode;
@@ -1893,7 +1893,7 @@ sys_fchown(struct proc *p, void *v, regi
mode = VNOVAL;
} else
mode = VNOVAL;
- VATTR_NULL(&vattr);
+ vattr_null(&vattr);
vattr.va_uid = uid;
vattr.va_gid = gid;
vattr.va_mode = mode;
@@ -1922,7 +1922,7 @@ sys_utimes(struct proc *p, void *v, regi
int error;
struct nameidata nd;
- VATTR_NULL(&vattr);
+ vattr_null(&vattr);
if (SCARG(uap, tptr) == NULL) {
getmicrotime(&tv[0]);
tv[1] = tv[0];
@@ -1973,7 +1973,7 @@ sys_futimes(struct proc *p, void *v, reg
int error;
struct file *fp;
- VATTR_NULL(&vattr);
+ vattr_null(&vattr);
if (SCARG(uap, tptr) == NULL) {
getmicrotime(&tv[0]);
tv[1] = tv[0];
@@ -2033,7 +2033,7 @@ sys_truncate(struct proc *p, void *v, re
error = EISDIR;
else if ((error = VOP_ACCESS(vp, VWRITE, p->p_ucred, p)) == 0 &&
(error = vn_writechk(vp)) == 0) {
- VATTR_NULL(&vattr);
+ vattr_null(&vattr);
vattr.va_size = SCARG(uap, length);
error = VOP_SETATTR(vp, &vattr, p->p_ucred, p);
}
@@ -2071,7 +2071,7 @@ sys_ftruncate(struct proc *p, void *v, r
if (vp->v_type == VDIR)
error = EISDIR;
else if ((error = vn_writechk(vp)) == 0) {
- VATTR_NULL(&vattr);
+ vattr_null(&vattr);
vattr.va_size = len;
error = VOP_SETATTR(vp, &vattr, fp->f_cred, p);
}
@@ -2227,7 +2227,7 @@ sys_mkdir(struct proc *p, void *v, regis
vrele(vp);
return (EEXIST);
}
- VATTR_NULL(&vattr);
+ vattr_null(&vattr);
vattr.va_type = VDIR;
vattr.va_mode = (SCARG(uap, mode) & ACCESSPERMS) &~ p->p_fd->fd_cmask;
error = VOP_MKDIR(nd.ni_dvp, &nd.ni_vp, &nd.ni_cnd, &vattr);
Index: sys/kern/vfs_vnops.c
===================================================================
RCS file: /home/cvs/src/sys/kern/vfs_vnops.c,v
retrieving revision 1.65
diff -u -p -r1.65 vfs_vnops.c
--- sys/kern/vfs_vnops.c 26 Jul 2010 01:56:27 -0000 1.65
+++ sys/kern/vfs_vnops.c 9 Sep 2010 12:04:19 -0000
@@ -94,7 +94,7 @@ vn_open(struct nameidata *ndp, int fmode
return (error);
if (ndp->ni_vp == NULL) {
- VATTR_NULL(&va);
+ vattr_null(&va);
va.va_type = VREG;
va.va_mode = cmode;
if (fmode & O_EXCL)
@@ -151,7 +151,7 @@ vn_open(struct nameidata *ndp, int fmode
}
}
if ((fmode & O_TRUNC) && vp->v_type == VREG) {
- VATTR_NULL(&va);
+ vattr_null(&va);
va.va_size = 0;
if ((error = VOP_SETATTR(vp, &va, cred, p)) != 0)
goto bad;
Index: sys/miscfs/portal/portal_vnops.c
===================================================================
RCS file: /home/cvs/src/sys/miscfs/portal/portal_vnops.c,v
retrieving revision 1.31
diff -u -p -r1.31 portal_vnops.c
--- sys/miscfs/portal/portal_vnops.c 14 Aug 2009 16:32:21 -0000 1.31
+++ sys/miscfs/portal/portal_vnops.c 9 Sep 2010 12:04:19 -0000
@@ -163,7 +163,7 @@ portal_lookup(void *v)
char *path;
int size;
- *vpp = NULLVP;
+ *vpp = NULL;
if (cnp->cn_nameiop == DELETE || cnp->cn_nameiop == RENAME)
return (EROFS);
Index: sys/miscfs/procfs/procfs_vnops.c
===================================================================
RCS file: /home/cvs/src/sys/miscfs/procfs/procfs_vnops.c,v
retrieving revision 1.48
diff -u -p -r1.48 procfs_vnops.c
--- sys/miscfs/procfs/procfs_vnops.c 6 Sep 2010 23:44:10 -0000 1.48
+++ sys/miscfs/procfs/procfs_vnops.c 9 Sep 2010 12:04:19 -0000
@@ -428,7 +428,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;
@@ -774,7 +774,7 @@ int
procfs_validfile(struct proc *p, struct mount *mp)
{
- return (p->p_textvp != NULLVP);
+ return (p->p_textvp != NULL);
}
int
Index: sys/msdosfs/msdosfs_vfsops.c
===================================================================
RCS file: /home/cvs/src/sys/msdosfs/msdosfs_vfsops.c,v
retrieving revision 1.57
diff -u -p -r1.57 msdosfs_vfsops.c
--- sys/msdosfs/msdosfs_vfsops.c 24 Jan 2010 18:12:46 -0000 1.57
+++ sys/msdosfs/msdosfs_vfsops.c 9 Sep 2010 12:04:19 -0000
@@ -118,7 +118,7 @@ msdosfs_mount(struct mount *mp, const ch
flags = WRITECLOSE;
if (mp->mnt_flag & MNT_FORCE)
flags |= FORCECLOSE;
- error = vflush(mp, NULLVP, flags);
+ error = vflush(mp, NULL, flags);
}
if (!error && (mp->mnt_flag & MNT_RELOAD))
/* not yet implemented */
@@ -586,7 +586,7 @@ msdosfs_unmount(struct mount *mp, int mn
flags |= FORCECLOSE;
#ifdef QUOTA
#endif
- if ((error = vflush(mp, NULLVP, flags)) != 0)
+ if ((error = vflush(mp, NULL, flags)) != 0)
return (error);
pmp = VFSTOMSDOSFS(mp);
pmp->pm_devvp->v_specmountpoint = NULL;
@@ -733,7 +733,7 @@ msdosfs_fhtovp(struct mount *mp, struct
error = deget(pmp, defhp->defid_dirclust, defhp->defid_dirofs, &dep);
if (error) {
- *vpp = NULLVP;
+ *vpp = NULL;
return (error);
}
*vpp = DETOV(dep);
Index: sys/nfs/nfs_serv.c
===================================================================
RCS file: /home/cvs/src/sys/nfs/nfs_serv.c,v
retrieving revision 1.91
diff -u -p -r1.91 nfs_serv.c
--- sys/nfs/nfs_serv.c 9 Sep 2010 10:37:04 -0000 1.91
+++ sys/nfs/nfs_serv.c 9 Sep 2010 12:04:23 -0000
@@ -231,7 +231,7 @@ nfsrv_setattr(struct nfsrv_descript *nfs
fhp = &nfh.fh_generic;
nfsm_srvmtofh(fhp);
- VATTR_NULL(&va);
+ vattr_null(&va);
if (info.nmi_v3) {
va.va_vaflags |= VA_UTIMES_NULL;
error = nfsm_srvsattr(&info.nmi_md, &va, info.nmi_mrep,
&info.nmi_dpos);
@@ -902,7 +902,7 @@ nfsrv_create(struct nfsrv_descript *nfsd
return (0);
}
- VATTR_NULL(&va);
+ vattr_null(&va);
if (info.nmi_v3) {
nfsm_dissect(tl, u_int32_t *, NFSX_UNSIGNED);
how = fxdr_unsigned(int, *tl);
@@ -962,7 +962,7 @@ nfsrv_create(struct nfsrv_descript *nfsd
pool_put(&namei_pool, nd.ni_cnd.cn_pnbuf);
if (exclusive_flag) {
exclusive_flag = 0;
- VATTR_NULL(&va);
+ vattr_null(&va);
bcopy(cverf, (caddr_t)&va.va_atime,
NFSX_V3CREATEVERF);
error = VOP_SETATTR(nd.ni_vp, &va, cred,
@@ -1036,7 +1036,7 @@ nfsrv_create(struct nfsrv_descript *nfsd
(nd.ni_cnd.cn_flags & RDONLY), procp, 0);
if (!error) {
tempsize = va.va_size;
- VATTR_NULL(&va);
+ vattr_null(&va);
va.va_size = tempsize;
error = VOP_SETATTR(vp, &va, cred,
procp);
@@ -1148,7 +1148,7 @@ nfsrv_mknod(struct nfsrv_descript *nfsd,
vput(nd.ni_dvp);
goto out;
}
- VATTR_NULL(&va);
+ vattr_null(&va);
error = nfsm_srvsattr(&info.nmi_md, &va, info.nmi_mrep, &info.nmi_dpos);
if (error)
goto nfsmout;
@@ -1667,7 +1667,7 @@ nfsrv_symlink(struct nfsrv_descript *nfs
}
if (error)
goto out;
- VATTR_NULL(&va);
+ vattr_null(&va);
if (info.nmi_v3)
error = nfsm_srvsattr(&info.nmi_md, &va, info.nmi_mrep,
&info.nmi_dpos);
@@ -1816,7 +1816,7 @@ nfsrv_mkdir(struct nfsrv_descript *nfsd,
return (0);
}
- VATTR_NULL(&va);
+ vattr_null(&va);
if (info.nmi_v3) {
error = nfsm_srvsattr(&info.nmi_md, &va, info.nmi_mrep,
&info.nmi_dpos);
Index: sys/nfs/nfs_vnops.c
===================================================================
RCS file: /home/cvs/src/sys/nfs/nfs_vnops.c,v
retrieving revision 1.131
diff -u -p -r1.131 nfs_vnops.c
--- sys/nfs/nfs_vnops.c 6 Sep 2010 23:44:10 -0000 1.131
+++ sys/nfs/nfs_vnops.c 9 Sep 2010 12:04:20 -0000
@@ -719,7 +719,7 @@ nfs_lookup(void *v)
cnp->cn_flags &= ~PDIRUNLOCK;
flags = cnp->cn_flags;
- *vpp = NULLVP;
+ *vpp = NULL;
if ((flags & ISLASTCN) && (dvp->v_mount->mnt_flag & MNT_RDONLY) &&
(cnp->cn_nameiop == DELETE || cnp->cn_nameiop == RENAME))
return (EROFS);
@@ -744,14 +744,14 @@ nfs_lookup(void *v)
int err2;
if (error && error != ENOENT) {
- *vpp = NULLVP;
+ *vpp = NULL;
return (error);
}
if (cnp->cn_flags & PDIRUNLOCK) {
err2 = vn_lock(dvp, LK_EXCLUSIVE | LK_RETRY, p);
if (err2 != 0) {
- *vpp = NULLVP;
+ *vpp = NULL;
return (err2);
}
cnp->cn_flags &= ~PDIRUNLOCK;
@@ -765,7 +765,7 @@ nfs_lookup(void *v)
else
vrele(*vpp);
}
- *vpp = NULLVP;
+ *vpp = NULL;
return (err2);
}
@@ -796,11 +796,11 @@ nfs_lookup(void *v)
vput(newvp);
else
vrele(newvp);
- *vpp = NULLVP;
+ *vpp = NULL;
}
dorpc:
error = 0;
- newvp = NULLVP;
+ newvp = NULL;
nfsstats.lookupcache_misses++;
nfsstats.rpccnt[NFSPROC_LOOKUP]++;
len = cnp->cn_namelen;
@@ -933,7 +933,7 @@ nfsmout:
cnp->cn_nameiop != CREATE) {
nfs_cache_enter(dvp, NULL, cnp);
}
- if (newvp != NULLVP) {
+ if (newvp != NULL) {
vrele(newvp);
if (newvp != dvp)
VOP_UNLOCK(newvp, 0, p);
@@ -2322,7 +2322,7 @@ nfs_readdirplusrpc(struct vnode *vp, str
panic("nfs readdirplusrpc bad uio");
#endif
ndp->ni_dvp = vp;
- newvp = NULLVP;
+ newvp = NULL;
txdr_hyper(uiop->uio_offset, &cookie.nfsuquad[0]);
@@ -2469,9 +2469,9 @@ nfs_readdirplusrpc(struct vnode *vp, str
i = fxdr_unsigned(int, *tl);
nfsm_adv(nfsm_rndup(i));
}
- if (newvp != NULLVP) {
+ if (newvp != NULL) {
vrele(newvp);
- newvp = NULLVP;
+ newvp = NULL;
}
nfsm_dissect(tl, u_int32_t *, NFSX_UNSIGNED);
more_dirs = fxdr_unsigned(int, *tl);
@@ -2511,7 +2511,7 @@ nfs_readdirplusrpc(struct vnode *vp, str
}
nfsmout:
- if (newvp != NULLVP)
+ if (newvp != NULL)
vrele(newvp);
return (error);
}
@@ -3195,7 +3195,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)
@@ -3264,7 +3264,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)
Index: sys/nnpfs/nnpfs_node-bsd.c
===================================================================
RCS file: /home/cvs/src/sys/nnpfs/nnpfs_node-bsd.c,v
retrieving revision 1.3
diff -u -p -r1.3 nnpfs_node-bsd.c
--- sys/nnpfs/nnpfs_node-bsd.c 6 Sep 2010 23:44:10 -0000 1.3
+++ sys/nnpfs/nnpfs_node-bsd.c 9 Sep 2010 12:04:20 -0000
@@ -337,7 +337,7 @@ void
nnpfs_attr2vattr(const struct nnpfs_attr *xa, struct vattr *va, int clear_node)
{
if (clear_node)
- VATTR_NULL(va);
+ vattr_null(va);
if (XA_VALID_MODE(xa))
va->va_mode = xa->xa_mode;
if (XA_VALID_NLINK(xa))
Index: sys/ntfs/ntfs_vfsops.c
===================================================================
RCS file: /home/cvs/src/sys/ntfs/ntfs_vfsops.c,v
retrieving revision 1.22
diff -u -p -r1.22 ntfs_vfsops.c
--- sys/ntfs/ntfs_vfsops.c 7 Sep 2010 00:41:05 -0000 1.22
+++ sys/ntfs/ntfs_vfsops.c 9 Sep 2010 12:04:20 -0000
@@ -482,7 +482,7 @@ out1:
if (ntmp->ntm_sysvn[i])
vrele(ntmp->ntm_sysvn[i]);
- if (vflush(mp,NULLVP,0))
+ if (vflush(mp,NULL,0))
dprintf(("ntfs_mountfs: vflush failed\n"));
out:
@@ -531,7 +531,7 @@ ntfs_unmount(
flags |= FORCECLOSE;
dprintf(("ntfs_unmount: vflushing...\n"));
- error = vflush(mp,NULLVP,flags | SKIPSYSTEM);
+ error = vflush(mp,NULL,flags | SKIPSYSTEM);
if (error) {
dprintf(("ntfs_unmount: vflush failed: %d\n",error));
return (error);
@@ -547,7 +547,7 @@ ntfs_unmount(
if(ntmp->ntm_sysvn[i]) vrele(ntmp->ntm_sysvn[i]);
/* vflush system vnodes */
- error = vflush(mp,NULLVP,flags);
+ error = vflush(mp,NULL,flags);
if (error) {
/* XXX should this be panic() ? */
printf("ntfs_unmount: vflush failed(sysnodes): %d\n",error);
@@ -707,7 +707,7 @@ ntfs_fhtovp(
error = ntfs_vgetex(mp, ntfhp->ntfid_ino, ntfhp->ntfid_attr, NULL,
LK_EXCLUSIVE | LK_RETRY, 0, curproc, vpp); /* XXX */
if (error != 0) {
- *vpp = NULLVP;
+ *vpp = NULL;
return (error);
}
Index: sys/sys/exec.h
===================================================================
RCS file: /home/cvs/src/sys/sys/exec.h,v
retrieving revision 1.25
diff -u -p -r1.25 exec.h
--- sys/sys/exec.h 9 Jul 2009 22:29:56 -0000 1.25
+++ sys/sys/exec.h 9 Sep 2010 12:04:20 -0000
@@ -203,7 +203,7 @@ void new_vmcmd(struct exec_vmcmd_set *ev
vcp->ev_proc = (proc); \
vcp->ev_len = (len); \
vcp->ev_addr = (addr); \
- if ((vcp->ev_vp = (vp)) != NULLVP) \
+ if ((vcp->ev_vp = (vp)) != NULL) \
vref(vp); \
vcp->ev_offset = (offset); \
vcp->ev_prot = (prot); \
Index: sys/sys/vnode.h
===================================================================
RCS file: /home/cvs/src/sys/sys/vnode.h,v
retrieving revision 1.105
diff -u -p -r1.105 vnode.h
--- sys/sys/vnode.h 6 Sep 2010 23:44:10 -0000 1.105
+++ sys/sys/vnode.h 9 Sep 2010 12:38:57 -0000
@@ -241,8 +241,6 @@ TAILQ_HEAD(freelst, vnode);
extern struct freelst vnode_hold_list; /* free vnodes referencing buffers */
extern struct freelst vnode_free_list; /* vnode free list */
-#define VATTR_NULL(vap) vattr_null(vap)
-#define NULLVP ((struct vnode *)NULL)
#define VN_KNOTE(vp, b) \
KNOTE(&vp->v_selectinfo.si_note, (b))
Index: sys/ufs/ext2fs/ext2fs_subr.c
===================================================================
RCS file: /home/cvs/src/sys/ufs/ext2fs/ext2fs_subr.c,v
retrieving revision 1.21
diff -u -p -r1.21 ext2fs_subr.c
--- sys/ufs/ext2fs/ext2fs_subr.c 6 Sep 2010 23:44:10 -0000 1.21
+++ sys/ufs/ext2fs/ext2fs_subr.c 9 Sep 2010 12:04:20 -0000
@@ -113,7 +113,7 @@ ext2fs_checkoverlap(struct buf *bp, stru
last = start + btodb(bp->b_bcount) - 1;
LIST_FOREACH(ep, &bufhead, b_list) {
if (ep == bp || (ep->b_flags & B_INVAL) ||
- ep->b_vp == NULLVP)
+ ep->b_vp == NULL)
continue;
if (VOP_BMAP(ep->b_vp, (daddr64_t)0, &vp, (daddr64_t)0, NULL))
continue;
Index: sys/ufs/ext2fs/ext2fs_vfsops.c
===================================================================
RCS file: /home/cvs/src/sys/ufs/ext2fs/ext2fs_vfsops.c,v
retrieving revision 1.56
diff -u -p -r1.56 ext2fs_vfsops.c
--- sys/ufs/ext2fs/ext2fs_vfsops.c 6 Sep 2010 23:44:10 -0000 1.56
+++ sys/ufs/ext2fs/ext2fs_vfsops.c 9 Sep 2010 12:04:20 -0000
@@ -943,14 +943,14 @@ ext2fs_fhtovp(struct mount *mp, struct f
return (ESTALE);
if ((error = VFS_VGET(mp, ufhp->ufid_ino, &nvp)) != 0) {
- *vpp = NULLVP;
+ *vpp = NULL;
return (error);
}
ip = VTOI(nvp);
if (ip->i_e2fs_mode == 0 || ip->i_e2fs_dtime != 0 ||
ip->i_e2fs_gen != ufhp->ufid_gen) {
vput(nvp);
- *vpp = NULLVP;
+ *vpp = NULL;
return (ESTALE);
}
*vpp = nvp;
Index: sys/ufs/ffs/ffs_subr.c
===================================================================
RCS file: /home/cvs/src/sys/ufs/ffs/ffs_subr.c,v
retrieving revision 1.24
diff -u -p -r1.24 ffs_subr.c
--- sys/ufs/ffs/ffs_subr.c 14 Aug 2009 13:05:08 -0000 1.24
+++ sys/ufs/ffs/ffs_subr.c 9 Sep 2010 12:04:20 -0000
@@ -131,7 +131,7 @@ ffs_checkoverlap(struct buf *bp, struct
last = start + btodb(bp->b_bcount) - 1;
LIST_FOREACH(ep, &bufhead, b_list) {
if (ep == bp || (ep->b_flags & B_INVAL) ||
- ep->b_vp == NULLVP)
+ ep->b_vp == NULL)
continue;
if (VOP_BMAP(ep->b_vp, (daddr64_t)0, &vp, (daddr64_t)0, NULL))
continue;
Index: sys/ufs/ffs/ffs_vfsops.c
===================================================================
RCS file: /home/cvs/src/sys/ufs/ffs/ffs_vfsops.c,v
retrieving revision 1.126
diff -u -p -r1.126 ffs_vfsops.c
--- sys/ufs/ffs/ffs_vfsops.c 6 Sep 2010 23:44:10 -0000 1.126
+++ sys/ufs/ffs/ffs_vfsops.c 9 Sep 2010 12:04:20 -0000
@@ -860,7 +860,7 @@ ffs_mountfs(struct vnode *devvp, struct
ump->um_bptrtodb = fs->fs_fsbtodb;
ump->um_seqinc = fs->fs_frag;
for (i = 0; i < MAXQUOTAS; i++)
- ump->um_quotas[i] = NULLVP;
+ ump->um_quotas[i] = NULL;
devvp->v_specmountpoint = mp;
ffs_oldfscompat(fs);
@@ -1068,10 +1068,10 @@ ffs_flushfiles(struct mount *mp, int fla
ump = VFSTOUFS(mp);
if (mp->mnt_flag & MNT_QUOTA) {
int i;
- if ((error = vflush(mp, NULLVP, SKIPSYSTEM|flags)) != 0)
+ if ((error = vflush(mp, NULL, SKIPSYSTEM|flags)) != 0)
return (error);
for (i = 0; i < MAXQUOTAS; i++) {
- if (ump->um_quotas[i] == NULLVP)
+ if (ump->um_quotas[i] == NULL)
continue;
quotaoff(p, mp, i);
}
Index: sys/ufs/ufs/ufs_ihash.c
===================================================================
RCS file: /home/cvs/src/sys/ufs/ufs/ufs_ihash.c,v
retrieving revision 1.16
diff -u -p -r1.16 ufs_ihash.c
--- sys/ufs/ufs/ufs_ihash.c 19 Jul 2010 21:13:43 -0000 1.16
+++ sys/ufs/ufs/ufs_ihash.c 9 Sep 2010 12:04:20 -0000
@@ -76,7 +76,7 @@ ufs_ihashlookup(dev_t dev, ino_t inum)
if (ip)
return (ITOV(ip));
- return (NULLVP);
+ return (NULL);
}
/*
Index: sys/ufs/ufs/ufs_quota.c
===================================================================
RCS file: /home/cvs/src/sys/ufs/ufs/ufs_quota.c,v
retrieving revision 1.30
diff -u -p -r1.30 ufs_quota.c
--- sys/ufs/ufs/ufs_quota.c 5 Jan 2008 19:49:26 -0000 1.30
+++ sys/ufs/ufs/ufs_quota.c 9 Sep 2010 12:04:20 -0000
@@ -440,7 +440,7 @@ chkdquot(struct inode *ip)
panic ("chkdquot: vnode is not locked");
for (i = 0; i < MAXQUOTAS; i++) {
- if (ump->um_quotas[i] == NULLVP ||
+ if (ump->um_quotas[i] == NULL ||
(ump->um_qflags[i] & (QTF_OPENING|QTF_CLOSING)))
continue;
if (ip->i_dquot[i] == NODQUOT) {
@@ -515,12 +515,12 @@ quotaon(struct proc *p, struct mount *mp
ump->um_cred[type] = p->p_ucred;
ump->um_btime[type] = MAX_DQ_TIME;
ump->um_itime[type] = MAX_IQ_TIME;
- if (dqget(NULLVP, 0, ump, type, &dq) == 0) {
+ if (dqget(NULL, 0, ump, type, &dq) == 0) {
if (dq->dq_btime > 0)
ump->um_btime[type] = dq->dq_btime;
if (dq->dq_itime > 0)
ump->um_itime[type] = dq->dq_itime;
- dqrele(NULLVP, dq);
+ dqrele(NULL, dq);
}
/*
* Search vnodes associated with this mount point,
@@ -576,7 +576,7 @@ quotaoff(struct proc *p, struct mount *m
if (!vfs_isbusy(mp))
panic ("quotaoff: mount point not busy");
#endif
- if ((qvp = ump->um_quotas[type]) == NULLVP)
+ if ((qvp = ump->um_quotas[type]) == NULL)
return (0);
ump->um_qflags[type] |= QTF_CLOSING;
/*
@@ -588,12 +588,12 @@ quotaoff(struct proc *p, struct mount *m
vfs_mount_foreach_vnode(mp, quotaoff_vnode, &qa);
error = vn_close(qvp, FREAD|FWRITE, p->p_ucred, p);
- ump->um_quotas[type] = NULLVP;
+ ump->um_quotas[type] = NULL;
crfree(ump->um_cred[type]);
ump->um_cred[type] = NOCRED;
ump->um_qflags[type] &= ~QTF_CLOSING;
for (type = 0; type < MAXQUOTAS; type++)
- if (ump->um_quotas[type] != NULLVP)
+ if (ump->um_quotas[type] != NULL)
break;
if (type == MAXQUOTAS)
mp->mnt_flag &= ~MNT_QUOTA;
@@ -609,10 +609,10 @@ getquota(struct mount *mp, u_long id, in
struct dquot *dq;
int error;
- if ((error = dqget(NULLVP, id, VFSTOUFS(mp), type, &dq)) != 0)
+ if ((error = dqget(NULL, id, VFSTOUFS(mp), type, &dq)) != 0)
return (error);
error = copyout((caddr_t)&dq->dq_dqb, addr, sizeof (struct dqblk));
- dqrele(NULLVP, dq);
+ dqrele(NULL, dq);
return (error);
}
@@ -631,7 +631,7 @@ setquota(struct mount *mp, u_long id, in
error = copyin(addr, (caddr_t)&newlim, sizeof (struct dqblk));
if (error)
return (error);
- if ((error = dqget(NULLVP, id, ump, type, &ndq)) != 0)
+ if ((error = dqget(NULL, id, ump, type, &ndq)) != 0)
return (error);
dq = ndq;
while (dq->dq_flags & DQ_LOCK) {
@@ -668,7 +668,7 @@ setquota(struct mount *mp, u_long id, in
else
dq->dq_flags &= ~DQ_FAKE;
dq->dq_flags |= DQ_MOD;
- dqrele(NULLVP, dq);
+ dqrele(NULL, dq);
return (0);
}
@@ -687,7 +687,7 @@ setuse(struct mount *mp, u_long id, int
error = copyin(addr, (caddr_t)&usage, sizeof (struct dqblk));
if (error)
return (error);
- if ((error = dqget(NULLVP, id, ump, type, &ndq)) != 0)
+ if ((error = dqget(NULL, id, ump, type, &ndq)) != 0)
return (error);
dq = ndq;
while (dq->dq_flags & DQ_LOCK) {
@@ -711,7 +711,7 @@ setuse(struct mount *mp, u_long id, int
if (dq->dq_curinodes < dq->dq_isoftlimit)
dq->dq_flags &= ~DQ_INODS;
dq->dq_flags |= DQ_MOD;
- dqrele(NULLVP, dq);
+ dqrele(NULL, dq);
return (0);
}
@@ -751,7 +751,7 @@ qsync(struct mount *mp)
* If not, simply return.
*/
for (i = 0; i < MAXQUOTAS; i++)
- if (ump->um_quotas[i] != NULLVP)
+ if (ump->um_quotas[i] != NULL)
break;
if (i == MAXQUOTAS)
return (0);
@@ -805,7 +805,7 @@ dqget(struct vnode *vp, u_long id, struc
int error;
dqvp = ump->um_quotas[type];
- if (dqvp == NULLVP || (ump->um_qflags[type] & QTF_CLOSING)) {
+ if (dqvp == NULL || (ump->um_qflags[type] & QTF_CLOSING)) {
*dqp = NODQUOT;
return (EINVAL);
}
@@ -942,7 +942,7 @@ dqsync(struct vnode *vp, struct dquot *d
panic("dqsync: dquot");
if ((dq->dq_flags & DQ_MOD) == 0)
return (0);
- if ((dqvp = dq->dq_vp) == NULLVP)
+ if ((dqvp = dq->dq_vp) == NULL)
panic("dqsync: file");
if (vp != dqvp)
Index: sys/ufs/ufs/ufs_vfsops.c
===================================================================
RCS file: /home/cvs/src/sys/ufs/ufs/ufs_vfsops.c,v
retrieving revision 1.15
diff -u -p -r1.15 ufs_vfsops.c
--- sys/ufs/ufs/ufs_vfsops.c 4 Apr 2006 11:21:40 -0000 1.15
+++ sys/ufs/ufs/ufs_vfsops.c 9 Sep 2010 12:04:20 -0000
@@ -137,13 +137,13 @@ ufs_fhtovp(struct mount *mp, struct ufid
int error;
if ((error = VFS_VGET(mp, ufhp->ufid_ino, &nvp)) != 0) {
- *vpp = NULLVP;
+ *vpp = NULL;
return (error);
}
ip = VTOI(nvp);
if (DIP(ip, mode) == 0 || DIP(ip, gen) != ufhp->ufid_gen) {
vput(nvp);
- *vpp = NULLVP;
+ *vpp = NULL;
return (ESTALE);
}
*vpp = nvp;
Index: sys/uvm/uvm_swap.c
===================================================================
RCS file: /home/cvs/src/sys/uvm/uvm_swap.c,v
retrieving revision 1.96
diff -u -p -r1.96 uvm_swap.c
--- sys/uvm/uvm_swap.c 6 Sep 2010 23:44:11 -0000 1.96
+++ sys/uvm/uvm_swap.c 9 Sep 2010 12:04:20 -0000
@@ -1343,7 +1343,7 @@ sw_reg_strategy(struct swapdev *sdp, str
nbp->vb_buf.b_blkno = nbn + btodb(off);
nbp->vb_buf.b_proc = bp->b_proc;
nbp->vb_buf.b_iodone = sw_reg_iodone;
- nbp->vb_buf.b_vp = NULLVP;
+ nbp->vb_buf.b_vp = NULL;
nbp->vb_buf.b_vnbufs.le_next = NOLIST;
LIST_INIT(&nbp->vb_buf.b_dep);
Index: usr.sbin/afs/src/nnpfs/bsd/nnpfs_node-bsd.c
===================================================================
RCS file: /home/cvs/src/usr.sbin/afs/src/nnpfs/bsd/nnpfs_node-bsd.c,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 nnpfs_node-bsd.c
--- usr.sbin/afs/src/nnpfs/bsd/nnpfs_node-bsd.c 5 Aug 2003 08:21:02 -0000
1.1.1.1
+++ usr.sbin/afs/src/nnpfs/bsd/nnpfs_node-bsd.c 9 Sep 2010 11:36:09 -0000
@@ -344,7 +344,7 @@ void
nnpfs_attr2vattr(const struct nnpfs_attr *xa, struct vattr *va, int clear_node)
{
if (clear_node)
- VATTR_NULL(va);
+ vattr_null(va);
if (XA_VALID_MODE(xa))
va->va_mode = xa->xa_mode;
if (XA_VALID_NLINK(xa))
