vattr_null => VATTR_NULL

SCCS-vsn: sys/nfs/nfs_serv.c 7.17
SCCS-vsn: sys/kern/vfs_syscalls.c 7.45
SCCS-vsn: sys/kern/vfs_vnops.c 7.19
SCCS-vsn: sys/kern/uipc_usrreq.c 7.16
SCCS-vsn: sys/kern/kern_sig.c 7.13

diff --git a/usr/src/sys/kern/kern_sig.c b/usr/src/sys/kern/kern_sig.c
index 7666d8a..b24d5ed 100644 (file)
--- a/usr/src/sys/kern/kern_sig.c
+++ b/usr/src/sys/kern/kern_sig.c
@@ -14,7 +14,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *

- *     @(#)kern_sig.c  7.12 (Berkeley) %G%
+ *     @(#)kern_sig.c  7.13 (Berkeley) %G%

  */
 
 #include "param.h"
  */
 
 #include "param.h"


@@ -973,7 +973,7 @@ core()
                        munmapfd(fd);
        }
 #endif
                        munmapfd(fd);
        }
 #endif

-       vattr_null(&vattr);
+       VATTR_NULL(&vattr);

        vattr.va_size = 0;
        VOP_SETATTR(vp, &vattr, u.u_cred);
        u.u_acflag |= ACORE;
        vattr.va_size = 0;
        VOP_SETATTR(vp, &vattr, u.u_cred);
        u.u_acflag |= ACORE;

diff --git a/usr/src/sys/kern/uipc_usrreq.c b/usr/src/sys/kern/uipc_usrreq.c
index 001bf64..b8a316c 100644 (file)
--- a/usr/src/sys/kern/uipc_usrreq.c
+++ b/usr/src/sys/kern/uipc_usrreq.c
@@ -12,7 +12,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *

- *     @(#)uipc_usrreq.c       7.15 (Berkeley) %G%
+ *     @(#)uipc_usrreq.c       7.16 (Berkeley) %G%

  */
 
 #include "param.h"
  */
 
 #include "param.h"


@@ -371,7 +371,7 @@ unp_bind(unp, nam)
                VOP_ABORTOP(ndp);
                return (EADDRINUSE);
        }
                VOP_ABORTOP(ndp);
                return (EADDRINUSE);
        }

-       vattr_null(&vattr);
+       VATTR_NULL(&vattr);

        vattr.va_type = VSOCK;
        vattr.va_mode = 0777;
        if (error = VOP_CREATE(ndp, &vattr))
        vattr.va_type = VSOCK;
        vattr.va_mode = 0777;
        if (error = VOP_CREATE(ndp, &vattr))

diff --git a/usr/src/sys/kern/vfs_syscalls.c b/usr/src/sys/kern/vfs_syscalls.c
index 8edbe39..bd2df24 100644 (file)
--- a/usr/src/sys/kern/vfs_syscalls.c
+++ b/usr/src/sys/kern/vfs_syscalls.c
@@ -14,7 +14,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *

- *     @(#)vfs_syscalls.c      7.44 (Berkeley) %G%
+ *     @(#)vfs_syscalls.c      7.45 (Berkeley) %G%

  */
 
 #include "param.h"
  */
 
 #include "param.h"


@@ -611,7 +611,7 @@ mknod(scp)
                error = EEXIST;
                goto out;
        }
                error = EEXIST;
                goto out;
        }

-       vattr_null(&vattr);
+       VATTR_NULL(&vattr);

        switch (uap->fmode & S_IFMT) {
 
        case S_IFMT:    /* used by badsect to flag bad sectors */
        switch (uap->fmode & S_IFMT) {
 
        case S_IFMT:    /* used by badsect to flag bad sectors */


@@ -663,7 +663,7 @@ mkfifo(scp)
                VOP_ABORTOP(ndp);
                RETURN (EEXIST);
        } else {
                VOP_ABORTOP(ndp);
                RETURN (EEXIST);
        } else {

-               vattr_null(&vattr);
+               VATTR_NULL(&vattr);

                vattr.va_type = VFIFO;
                vattr.va_mode = (uap->fmode & 07777) &~ scp->sc_cmask;
        }
                vattr.va_type = VFIFO;
                vattr.va_mode = (uap->fmode & 07777) &~ scp->sc_cmask;
        }


@@ -746,7 +746,7 @@ symlink(scp)
                goto out;
        }
        vp = ndp->ni_dvp;
                goto out;
        }
        vp = ndp->ni_dvp;

-       vattr_null(&vattr);
+       VATTR_NULL(&vattr);

        vattr.va_mode = 0777 &~ scp->sc_cmask;
 out:
        if (error)
        vattr.va_mode = 0777 &~ scp->sc_cmask;
 out:
        if (error)


@@ -993,7 +993,7 @@ chflags(scp)
        ndp->ni_nameiop = LOOKUP | FOLLOW | LOCKLEAF;
        ndp->ni_segflg = UIO_USERSPACE;
        ndp->ni_dirp = uap->fname;
        ndp->ni_nameiop = LOOKUP | FOLLOW | LOCKLEAF;
        ndp->ni_segflg = UIO_USERSPACE;
        ndp->ni_dirp = uap->fname;

-       vattr_null(&vattr);
+       VATTR_NULL(&vattr);

        vattr.va_flags = uap->flags;
        if (error = namei(ndp))
                RETURN (error);
        vattr.va_flags = uap->flags;
        if (error = namei(ndp))
                RETURN (error);


@@ -1025,7 +1025,7 @@ fchflags(scp)
 
        if (error = getvnode(scp->sc_ofile, uap->fd, &fp))
                RETURN (error);
 
        if (error = getvnode(scp->sc_ofile, uap->fd, &fp))
                RETURN (error);

-       vattr_null(&vattr);
+       VATTR_NULL(&vattr);

        vattr.va_flags = uap->flags;
        vp = (struct vnode *)fp->f_data;
        VOP_LOCK(vp);
        vattr.va_flags = uap->flags;
        vp = (struct vnode *)fp->f_data;
        VOP_LOCK(vp);


@@ -1057,7 +1057,7 @@ chmod(scp)
        ndp->ni_nameiop = LOOKUP | FOLLOW | LOCKLEAF;
        ndp->ni_segflg = UIO_USERSPACE;
        ndp->ni_dirp = uap->fname;
        ndp->ni_nameiop = LOOKUP | FOLLOW | LOCKLEAF;
        ndp->ni_segflg = UIO_USERSPACE;
        ndp->ni_dirp = uap->fname;

-       vattr_null(&vattr);
+       VATTR_NULL(&vattr);

        vattr.va_mode = uap->fmode & 07777;
        if (error = namei(ndp))
                RETURN (error);
        vattr.va_mode = uap->fmode & 07777;
        if (error = namei(ndp))
                RETURN (error);


@@ -1089,7 +1089,7 @@ fchmod(scp)
 
        if (error = getvnode(scp->sc_ofile, uap->fd, &fp))
                RETURN (error);
 
        if (error = getvnode(scp->sc_ofile, uap->fd, &fp))
                RETURN (error);

-       vattr_null(&vattr);
+       VATTR_NULL(&vattr);

        vattr.va_mode = uap->fmode & 07777;
        vp = (struct vnode *)fp->f_data;
        VOP_LOCK(vp);
        vattr.va_mode = uap->fmode & 07777;
        vp = (struct vnode *)fp->f_data;
        VOP_LOCK(vp);


@@ -1122,7 +1122,7 @@ chown(scp)
        ndp->ni_nameiop = LOOKUP | NOFOLLOW | LOCKLEAF;
        ndp->ni_segflg = UIO_USERSPACE;
        ndp->ni_dirp = uap->fname;
        ndp->ni_nameiop = LOOKUP | NOFOLLOW | LOCKLEAF;
        ndp->ni_segflg = UIO_USERSPACE;
        ndp->ni_dirp = uap->fname;

-       vattr_null(&vattr);
+       VATTR_NULL(&vattr);

        vattr.va_uid = uap->uid;
        vattr.va_gid = uap->gid;
        if (error = namei(ndp))
        vattr.va_uid = uap->uid;
        vattr.va_gid = uap->gid;
        if (error = namei(ndp))


@@ -1156,7 +1156,7 @@ fchown(scp)
 
        if (error = getvnode(scp->sc_ofile, uap->fd, &fp))
                RETURN (error);
 
        if (error = getvnode(scp->sc_ofile, uap->fd, &fp))
                RETURN (error);

-       vattr_null(&vattr);
+       VATTR_NULL(&vattr);

        vattr.va_uid = uap->uid;
        vattr.va_gid = uap->gid;
        vp = (struct vnode *)fp->f_data;
        vattr.va_uid = uap->uid;
        vattr.va_gid = uap->gid;
        vp = (struct vnode *)fp->f_data;


@@ -1189,7 +1189,7 @@ utimes(scp)
        ndp->ni_nameiop = LOOKUP | FOLLOW | LOCKLEAF;
        ndp->ni_segflg = UIO_USERSPACE;
        ndp->ni_dirp = uap->fname;
        ndp->ni_nameiop = LOOKUP | FOLLOW | LOCKLEAF;
        ndp->ni_segflg = UIO_USERSPACE;
        ndp->ni_dirp = uap->fname;

-       vattr_null(&vattr);
+       VATTR_NULL(&vattr);

        vattr.va_atime = tv[0];
        vattr.va_mtime = tv[1];
        if (error = namei(ndp))
        vattr.va_atime = tv[0];
        vattr.va_mtime = tv[1];
        if (error = namei(ndp))


@@ -1223,7 +1223,7 @@ truncate(scp)
        ndp->ni_nameiop = LOOKUP | FOLLOW | LOCKLEAF;
        ndp->ni_segflg = UIO_USERSPACE;
        ndp->ni_dirp = uap->fname;
        ndp->ni_nameiop = LOOKUP | FOLLOW | LOCKLEAF;
        ndp->ni_segflg = UIO_USERSPACE;
        ndp->ni_dirp = uap->fname;

-       vattr_null(&vattr);
+       VATTR_NULL(&vattr);

        vattr.va_size = uap->length;
        if (error = namei(ndp))
                RETURN (error);
        vattr.va_size = uap->length;
        if (error = namei(ndp))
                RETURN (error);


@@ -1260,7 +1260,7 @@ ftruncate(scp)
                RETURN (error);
        if ((fp->f_flag & FWRITE) == 0)
                RETURN (EINVAL);
                RETURN (error);
        if ((fp->f_flag & FWRITE) == 0)
                RETURN (EINVAL);

-       vattr_null(&vattr);
+       VATTR_NULL(&vattr);

        vattr.va_size = uap->length;
        vp = (struct vnode *)fp->f_data;
        VOP_LOCK(vp);
        vattr.va_size = uap->length;
        vp = (struct vnode *)fp->f_data;
        VOP_LOCK(vp);


@@ -1393,7 +1393,7 @@ mkdir(scp)
                VOP_ABORTOP(ndp);
                RETURN (EEXIST);
        }
                VOP_ABORTOP(ndp);
                RETURN (EEXIST);
        }

-       vattr_null(&vattr);
+       VATTR_NULL(&vattr);

        vattr.va_type = VDIR;
        vattr.va_mode = (uap->dmode & 0777) &~ scp->sc_cmask;
        error = VOP_MKDIR(ndp, &vattr);
        vattr.va_type = VDIR;
        vattr.va_mode = (uap->dmode & 0777) &~ scp->sc_cmask;
        error = VOP_MKDIR(ndp, &vattr);

diff --git a/usr/src/sys/kern/vfs_vnops.c b/usr/src/sys/kern/vfs_vnops.c
index 885c37b..e746eb1 100644 (file)
--- a/usr/src/sys/kern/vfs_vnops.c
+++ b/usr/src/sys/kern/vfs_vnops.c
@@ -14,7 +14,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *

- *     @(#)vfs_vnops.c 7.18 (Berkeley) %G%
+ *     @(#)vfs_vnops.c 7.19 (Berkeley) %G%

  */
 
 #include "param.h"
  */
 
 #include "param.h"


@@ -57,7 +57,7 @@ vn_open(ndp, fmode, cmode)
                if (error = namei(ndp))
                        return (error);
                if (ndp->ni_vp == NULL) {
                if (error = namei(ndp))
                        return (error);
                if (ndp->ni_vp == NULL) {

-                       vattr_null(vap);
+                       VATTR_NULL(vap);

                        vap->va_type = VREG;
                        vap->va_mode = cmode;
                        if (error = VOP_CREATE(ndp, vap))
                        vap->va_type = VREG;
                        vap->va_mode = cmode;
                        if (error = VOP_CREATE(ndp, vap))


@@ -103,7 +103,7 @@ vn_open(ndp, fmode, cmode)
                }
        }
        if (fmode & FTRUNC) {
                }
        }
        if (fmode & FTRUNC) {

-               vattr_null(vap);
+               VATTR_NULL(vap);

                vap->va_size = 0;
                if (error = VOP_SETATTR(vp, vap, ndp->ni_cred))
                        goto bad;
                vap->va_size = 0;
                if (error = VOP_SETATTR(vp, vap, ndp->ni_cred))
                        goto bad;

diff --git a/usr/src/sys/nfs/nfs_serv.c b/usr/src/sys/nfs/nfs_serv.c
index 7b9bc36..17a5238 100644 (file)
--- a/usr/src/sys/nfs/nfs_serv.c
+++ b/usr/src/sys/nfs/nfs_serv.c
@@ -17,7 +17,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *

- *     @(#)nfs_serv.c  7.16 (Berkeley) %G%
+ *     @(#)nfs_serv.c  7.17 (Berkeley) %G%

  */
 
 /*
  */
 
 /*


@@ -128,7 +128,7 @@ nfsrv_setattr(mrep, md, dpos, cred, xid, mrq, repstat)
                nfsm_reply(0);
        if (error = nfsrv_access(vp, VWRITE, cred))
                goto out;
                nfsm_reply(0);
        if (error = nfsrv_access(vp, VWRITE, cred))
                goto out;

-       vattr_null(vap);
+       VATTR_NULL(vap);

        /*
         * Nah nah nah nah na nah
         * There is a bug in the Sun client that puts 0xffff in the mode
        /*
         * Nah nah nah nah na nah
         * There is a bug in the Sun client that puts 0xffff in the mode


@@ -550,7 +550,7 @@ nfsrv_create(mrep, md, dpos, cred, xid, mrq, repstat)
        ndp->ni_nameiop = CREATE | LOCKPARENT | LOCKLEAF;
        if (error = nfs_namei(ndp, fhp, len, &md, &dpos))
                nfsm_reply(0);
        ndp->ni_nameiop = CREATE | LOCKPARENT | LOCKLEAF;
        if (error = nfs_namei(ndp, fhp, len, &md, &dpos))
                nfsm_reply(0);

-       vattr_null(vap);
+       VATTR_NULL(vap);

        nfsm_disect(p, u_long *, NFSX_UNSIGNED);
        /*
         * Iff doesn't exist, create it
        nfsm_disect(p, u_long *, NFSX_UNSIGNED);
        /*
         * Iff doesn't exist, create it


@@ -836,7 +836,7 @@ nfsrv_symlink(mrep, md, dpos, cred, xid, mrq, repstat)
                goto out;
        }
        vp = ndp->ni_dvp;
                goto out;
        }
        vp = ndp->ni_dvp;

-       vattr_null(vap);
+       VATTR_NULL(vap);

        vap->va_mode = 0777;
 out:
        if (error)
        vap->va_mode = 0777;
 out:
        if (error)


@@ -887,7 +887,7 @@ nfsrv_mkdir(mrep, md, dpos, cred, xid, mrq, repstat)
        if (error = nfs_namei(ndp, fhp, len, &md, &dpos))
                nfsm_reply(0);
        nfsm_disect(p, u_long *, NFSX_UNSIGNED);
        if (error = nfs_namei(ndp, fhp, len, &md, &dpos))
                nfsm_reply(0);
        nfsm_disect(p, u_long *, NFSX_UNSIGNED);

-       vattr_null(vap);
+       VATTR_NULL(vap);

        vap->va_type = VDIR;
        vap->va_mode = nfstov_mode(*p++);
        vp = ndp->ni_vp;
        vap->va_type = VDIR;
        vap->va_mode = nfstov_mode(*p++);
        vp = ndp->ni_vp;