return types, 64-bit changes: ioctl cmd -> u_long, casts, etc.

SCCS-vsn: sys/kern/subr_log.c 8.2
SCCS-vsn: sys/kern/tty_tb.c 8.2
SCCS-vsn: sys/kern/tty.c 8.13
SCCS-vsn: sys/kern/kern_sig.c 8.12
SCCS-vsn: sys/kern/tty_pty.c 8.3
SCCS-vsn: sys/kern/kern_resource.c 8.7
SCCS-vsn: sys/kern/sys_socket.c 8.2
SCCS-vsn: sys/kern/vfs_bio.c 8.11
SCCS-vsn: sys/kern/uipc_usrreq.c 8.6
SCCS-vsn: sys/kern/kern_prot.c 8.8
SCCS-vsn: sys/kern/uipc_mbuf.c 8.3
SCCS-vsn: sys/kern/kern_proc.c 8.6
SCCS-vsn: sys/kern/tty_tty.c 8.3
SCCS-vsn: sys/kern/tty_compat.c 8.2
SCCS-vsn: sys/kern/vfs_subr.c 8.14
SCCS-vsn: sys/kern/tty_conf.c 8.5
SCCS-vsn: sys/kern/vfs_vnops.c 8.6

diff --git a/usr/src/sys/kern/kern_proc.c b/usr/src/sys/kern/kern_proc.c
index 8c27ddf..a07c1b2 100644 (file)
--- a/usr/src/sys/kern/kern_proc.c
+++ b/usr/src/sys/kern/kern_proc.c
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)kern_proc.c 8.5 (Berkeley) %G%
+ *     @(#)kern_proc.c 8.6 (Berkeley) %G%

  */
 
 #include <sys/param.h>
  */
 
 #include <sys/param.h>


@@ -48,6 +48,7 @@ struct proclist zombproc;
 /*
  * Initialize global process hashing structures.
  */
 /*
  * Initialize global process hashing structures.
  */

+void

 procinit()
 {
 
 procinit()
 {
 


@@ -235,6 +236,7 @@ leavepgrp(p)
 /*
  * delete a process group
  */
 /*
  * delete a process group
  */

+void

 pgdelete(pgrp)
        register struct pgrp *pgrp;
 {
 pgdelete(pgrp)
        register struct pgrp *pgrp;
 {


@@ -260,6 +262,7 @@ static void orphanpg();
  * entering == 0 => p is leaving specified group.
  * entering == 1 => p is entering specified group.
  */
  * entering == 0 => p is leaving specified group.
  * entering == 1 => p is entering specified group.
  */

+void

 fixjobc(p, pgrp, entering)
        register struct proc *p;
        register struct pgrp *pgrp;
 fixjobc(p, pgrp, entering)
        register struct proc *p;
        register struct pgrp *pgrp;

diff --git a/usr/src/sys/kern/kern_prot.c b/usr/src/sys/kern/kern_prot.c
index 5a7fa31..1530c55 100644 (file)
--- a/usr/src/sys/kern/kern_prot.c
+++ b/usr/src/sys/kern/kern_prot.c
@@ -9,7 +9,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)kern_prot.c 8.7 (Berkeley) %G%
+ *     @(#)kern_prot.c 8.8 (Berkeley) %G%

  */
 
 /*
  */
 
 /*


@@ -447,7 +447,7 @@ groupmember(gid, cred)
  */
 suser(cred, acflag)
        struct ucred *cred;
  */
 suser(cred, acflag)
        struct ucred *cred;

-       short *acflag;
+       u_short *acflag;

 {
        if (cred->cr_uid == 0) {
                if (acflag)
 {
        if (cred->cr_uid == 0) {
                if (acflag)


@@ -475,6 +475,7 @@ crget()
  * Free a cred structure.
  * Throws away space when ref count gets to 0.
  */
  * Free a cred structure.
  * Throws away space when ref count gets to 0.
  */

+void

 crfree(cr)
        struct ucred *cr;
 {
 crfree(cr)
        struct ucred *cr;
 {

diff --git a/usr/src/sys/kern/kern_resource.c b/usr/src/sys/kern/kern_resource.c
index 1ac71be..20d434d 100644 (file)
--- a/usr/src/sys/kern/kern_resource.c
+++ b/usr/src/sys/kern/kern_resource.c
@@ -9,7 +9,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)kern_resource.c     8.6 (Berkeley) %G%
+ *     @(#)kern_resource.c     8.7 (Berkeley) %G%

  */
 
 #include <sys/param.h>
  */
 
 #include <sys/param.h>


@@ -330,6 +330,7 @@ getrlimit(p, uap, retval)
  * Transform the running time and tick information in proc p into user,
  * system, and interrupt time usage.
  */
  * Transform the running time and tick information in proc p into user,
  * system, and interrupt time usage.
  */

+void

 calcru(p, up, sp, ip)
        register struct proc *p;
        register struct timeval *up;
 calcru(p, up, sp, ip)
        register struct proc *p;
        register struct timeval *up;


@@ -412,6 +413,7 @@ getrusage(p, uap, retval)
            sizeof (struct rusage)));
 }
 
            sizeof (struct rusage)));
 }
 

+void

 ruadd(ru, ru2)
        register struct rusage *ru, *ru2;
 {
 ruadd(ru, ru2)
        register struct rusage *ru, *ru2;
 {

diff --git a/usr/src/sys/kern/kern_sig.c b/usr/src/sys/kern/kern_sig.c
index 227660f..088d9ea 100644 (file)
--- a/usr/src/sys/kern/kern_sig.c
+++ b/usr/src/sys/kern/kern_sig.c
@@ -9,7 +9,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)kern_sig.c  8.11 (Berkeley) %G%
+ *     @(#)kern_sig.c  8.12 (Berkeley) %G%

  */
 
 #define        SIGPROP         /* include signal properties table */
  */
 
 #define        SIGPROP         /* include signal properties table */


@@ -598,7 +598,7 @@ void
 trapsignal(p, signum, code)
        struct proc *p;
        register int signum;
 trapsignal(p, signum, code)
        struct proc *p;
        register int signum;

-       u_int code;
+       u_long code;

 {
        register struct sigacts *ps = p->p_sigacts;
        int mask;
 {
        register struct sigacts *ps = p->p_sigacts;
        int mask;


@@ -1168,14 +1168,12 @@ out:
  * Nonexistent system call-- signal process (may want to handle it).
  * Flag error in case process won't see signal immediately (blocked or ignored).
  */
  * Nonexistent system call-- signal process (may want to handle it).
  * Flag error in case process won't see signal immediately (blocked or ignored).
  */

-struct nosys_args {
-       int     dummy;
-};

 /* ARGSUSED */
 /* ARGSUSED */

+int

 nosys(p, args, retval)
        struct proc *p;
 nosys(p, args, retval)
        struct proc *p;

-       struct nosys_args *args;
-       int *retval;
+       void *args;
+       register_t *retval;

 {
 
        psignal(p, SIGSYS);
 {
 
        psignal(p, SIGSYS);

diff --git a/usr/src/sys/kern/subr_log.c b/usr/src/sys/kern/subr_log.c
index 1524411..6fc24d4 100644 (file)
--- a/usr/src/sys/kern/subr_log.c
+++ b/usr/src/sys/kern/subr_log.c
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)subr_log.c  8.1 (Berkeley) %G%
+ *     @(#)subr_log.c  8.2 (Berkeley) %G%

  */
 
 /*
  */
 
 /*


@@ -161,7 +161,7 @@ logwakeup()
 /*ARGSUSED*/
 logioctl(dev, com, data, flag, p)
        dev_t dev;
 /*ARGSUSED*/
 logioctl(dev, com, data, flag, p)
        dev_t dev;

-       int com;
+       u_long com;

        caddr_t data;
        int flag;
        struct proc *p;
        caddr_t data;
        int flag;
        struct proc *p;

diff --git a/usr/src/sys/kern/sys_socket.c b/usr/src/sys/kern/sys_socket.c
index c055bc5..d38f166 100644 (file)
--- a/usr/src/sys/kern/sys_socket.c
+++ b/usr/src/sys/kern/sys_socket.c
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)sys_socket.c        8.1 (Berkeley) %G%
+ *     @(#)sys_socket.c        8.2 (Berkeley) %G%

  */
 
 #include <sys/param.h>
  */
 
 #include <sys/param.h>


@@ -48,7 +48,7 @@ soo_write(fp, uio, cred)
 
 soo_ioctl(fp, cmd, data, p)
        struct file *fp;
 
 soo_ioctl(fp, cmd, data, p)
        struct file *fp;

-       int cmd;
+       u_long cmd;

        register caddr_t data;
        struct proc *p;
 {
        register caddr_t data;
        struct proc *p;
 {

diff --git a/usr/src/sys/kern/tty.c b/usr/src/sys/kern/tty.c
index e772764..012f20a 100644 (file)
--- a/usr/src/sys/kern/tty.c
+++ b/usr/src/sys/kern/tty.c
@@ -9,7 +9,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)tty.c       8.12 (Berkeley) %G%
+ *     @(#)tty.c       8.13 (Berkeley) %G%

  */
 
 #include <sys/param.h>
  */
 
 #include <sys/param.h>


@@ -461,8 +461,9 @@ ttyoutput(c, tp)
 int
 ttioctl(tp, cmd, data, flag)
        register struct tty *tp;
 int
 ttioctl(tp, cmd, data, flag)
        register struct tty *tp;

-       int cmd, flag;
+       u_long cmd;

        void *data;
        void *data;

+       int flag;

 {
        extern struct tty *constty;     /* Temporary virtual console. */
        extern int nlinesw;
 {
        extern struct tty *constty;     /* Temporary virtual console. */
        extern int nlinesw;

diff --git a/usr/src/sys/kern/tty_compat.c b/usr/src/sys/kern/tty_compat.c
index a36e687..0f557c9 100644 (file)
--- a/usr/src/sys/kern/tty_compat.c
+++ b/usr/src/sys/kern/tty_compat.c
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)tty_compat.c        8.1 (Berkeley) %G%
+ *     @(#)tty_compat.c        8.2 (Berkeley) %G%

  */
 
 /* 
  */
 
 /* 


@@ -52,7 +52,7 @@ static int compatspcodes[16] = {
 /*ARGSUSED*/
 ttcompat(tp, com, data, flag)
        register struct tty *tp;
 /*ARGSUSED*/
 ttcompat(tp, com, data, flag)
        register struct tty *tp;

-       int com;
+       u_long com;

        caddr_t data;
        int flag;
 {
        caddr_t data;
        int flag;
 {

diff --git a/usr/src/sys/kern/tty_conf.c b/usr/src/sys/kern/tty_conf.c
index 65db769..2eabd9e 100644 (file)
--- a/usr/src/sys/kern/tty_conf.c
+++ b/usr/src/sys/kern/tty_conf.c
@@ -9,7 +9,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)tty_conf.c  8.4 (Berkeley) %G%
+ *     @(#)tty_conf.c  8.5 (Berkeley) %G%

  */
 
 #include <sys/param.h>
  */
 
 #include <sys/param.h>


@@ -26,7 +26,7 @@
 #define        ttyerrinput ((int (*) __P((int c, struct tty *)))enodev)
 #define        ttyerrstart ((int (*) __P((struct tty *)))enodev)
 
 #define        ttyerrinput ((int (*) __P((int c, struct tty *)))enodev)
 #define        ttyerrstart ((int (*) __P((struct tty *)))enodev)
 

-int    nullioctl __P((struct tty *tp, int cmd, caddr_t data,
+int    nullioctl __P((struct tty *tp, u_long cmd, caddr_t data,

                        int flag, struct proc *p));
 
 #include "tb.h"
                        int flag, struct proc *p));
 
 #include "tb.h"


@@ -34,7 +34,7 @@ int   nullioctl __P((struct tty *tp, int cmd, caddr_t data,
 int    tbopen __P((dev_t dev, struct tty *tp));
 int    tbclose __P((struct tty *tp, int flags));
 int    tbread __P((struct tty *, struct uio *, int flags));
 int    tbopen __P((dev_t dev, struct tty *tp));
 int    tbclose __P((struct tty *tp, int flags));
 int    tbread __P((struct tty *, struct uio *, int flags));

-int    tbioctl __P((struct tty *tp, int cmd, caddr_t data,
+int    tbioctl __P((struct tty *tp, u_long cmd, caddr_t data,

                        int flag, struct proc *p));
 int    tbinput __P((int c, struct tty *tp));
 #endif
                        int flag, struct proc *p));
 int    tbinput __P((int c, struct tty *tp));
 #endif


@@ -43,7 +43,7 @@ int   tbinput __P((int c, struct tty *tp));
 #if NSL > 0
 int    slopen __P((dev_t dev, struct tty *tp));
 int    slclose __P((struct tty *tp, int flags));
 #if NSL > 0
 int    slopen __P((dev_t dev, struct tty *tp));
 int    slclose __P((struct tty *tp, int flags));

-int    sltioctl __P((struct tty *tp, int cmd, caddr_t data,
+int    sltioctl __P((struct tty *tp, u_long cmd, caddr_t data,

                        int flag, struct proc *p));
 int    slinput __P((int c, struct tty *tp));
 int    slstart __P((struct tty *tp));
                        int flag, struct proc *p));
 int    slinput __P((int c, struct tty *tp));
 int    slstart __P((struct tty *tp));


@@ -87,7 +87,7 @@ int   nlinesw = sizeof (linesw) / sizeof (linesw[0]);
 /*ARGSUSED*/
 nullioctl(tp, cmd, data, flags, p)
        struct tty *tp;
 /*ARGSUSED*/
 nullioctl(tp, cmd, data, flags, p)
        struct tty *tp;

-       int cmd;
+       u_long cmd;

        char *data;
        int flags;
        struct proc *p;
        char *data;
        int flags;
        struct proc *p;

diff --git a/usr/src/sys/kern/tty_pty.c b/usr/src/sys/kern/tty_pty.c
index d57e2f0..d6f81a2 100644 (file)
--- a/usr/src/sys/kern/tty_pty.c
+++ b/usr/src/sys/kern/tty_pty.c
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)tty_pty.c   8.2 (Berkeley) %G%
+ *     @(#)tty_pty.c   8.3 (Berkeley) %G%

  */
 
 /*
  */
 
 /*


@@ -551,7 +551,7 @@ block:
 /*ARGSUSED*/
 ptyioctl(dev, cmd, data, flag, p)
        dev_t dev;
 /*ARGSUSED*/
 ptyioctl(dev, cmd, data, flag, p)
        dev_t dev;

-       int cmd;
+       u_long cmd;

        caddr_t data;
        int flag;
        struct proc *p;
        caddr_t data;
        int flag;
        struct proc *p;

diff --git a/usr/src/sys/kern/tty_tb.c b/usr/src/sys/kern/tty_tb.c
index b9a3ede..8cd91aa 100644 (file)
--- a/usr/src/sys/kern/tty_tb.c
+++ b/usr/src/sys/kern/tty_tb.c
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)tty_tb.c    8.1 (Berkeley) %G%
+ *     @(#)tty_tb.c    8.2 (Berkeley) %G%

  */
 
 #include "tb.h"
  */
 
 #include "tb.h"


@@ -284,7 +284,9 @@ poldecode(tc, cp, polpos)
 /*ARGSUSED*/
 tbioctl(tp, cmd, data, flag)
        struct tty *tp;
 /*ARGSUSED*/
 tbioctl(tp, cmd, data, flag)
        struct tty *tp;

+       u_long cmd;

        caddr_t data;
        caddr_t data;

+       int flag;

 {
        register struct tb *tbp = (struct tb *)tp->T_LINEP;
 
 {
        register struct tb *tbp = (struct tb *)tp->T_LINEP;
 

diff --git a/usr/src/sys/kern/tty_tty.c b/usr/src/sys/kern/tty_tty.c
index 26f369c..10b999a 100644 (file)
--- a/usr/src/sys/kern/tty_tty.c
+++ b/usr/src/sys/kern/tty_tty.c
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)tty_tty.c   8.2 (Berkeley) %G%
+ *     @(#)tty_tty.c   8.3 (Berkeley) %G%

  */
 
 /*
  */
 
 /*


@@ -88,7 +88,7 @@ cttywrite(dev, uio, flag)
 /*ARGSUSED*/
 cttyioctl(dev, cmd, addr, flag, p)
        dev_t dev;
 /*ARGSUSED*/
 cttyioctl(dev, cmd, addr, flag, p)
        dev_t dev;

-       int cmd;
+       u_long cmd;

        caddr_t addr;
        int flag;
        struct proc *p;
        caddr_t addr;
        int flag;
        struct proc *p;

diff --git a/usr/src/sys/kern/uipc_mbuf.c b/usr/src/sys/kern/uipc_mbuf.c
index 08d5100..faf82a2 100644 (file)
--- a/usr/src/sys/kern/uipc_mbuf.c
+++ b/usr/src/sys/kern/uipc_mbuf.c
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)uipc_mbuf.c 8.2 (Berkeley) %G%
+ *     @(#)uipc_mbuf.c 8.3 (Berkeley) %G%

  */
 
 #include <sys/param.h>
  */
 
 #include <sys/param.h>


@@ -352,6 +352,7 @@ m_cat(m, n)
        }
 }
 
        }
 }
 

+void

 m_adj(mp, req_len)
        struct mbuf *mp;
        int req_len;
 m_adj(mp, req_len)
        struct mbuf *mp;
        int req_len;

diff --git a/usr/src/sys/kern/uipc_usrreq.c b/usr/src/sys/kern/uipc_usrreq.c
index 4ca6d9d..89517b5 100644 (file)
--- a/usr/src/sys/kern/uipc_usrreq.c
+++ b/usr/src/sys/kern/uipc_usrreq.c
@@ -2,7 +2,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)uipc_usrreq.c       8.5 (Berkeley) %G%
+ *     @(#)uipc_usrreq.c       8.6 (Berkeley) %G%

  */
 
 #include <sys/param.h>
  */
 
 #include <sys/param.h>


@@ -481,6 +481,7 @@ unp_connect2(so, so2)
        return (0);
 }
 
        return (0);
 }
 

+void

 unp_disconnect(unp)
        struct unpcb *unp;
 {
 unp_disconnect(unp)
        struct unpcb *unp;
 {


@@ -526,6 +527,7 @@ unp_abort(unp)
 }
 #endif
 
 }
 #endif
 

+void

 unp_shutdown(unp)
        struct unpcb *unp;
 {
 unp_shutdown(unp)
        struct unpcb *unp;
 {


@@ -536,6 +538,7 @@ unp_shutdown(unp)
                socantrcvmore(so);
 }
 
                socantrcvmore(so);
 }
 

+void

 unp_drop(unp, errno)
        struct unpcb *unp;
        int errno;
 unp_drop(unp, errno)
        struct unpcb *unp;
        int errno;


@@ -624,9 +627,9 @@ unp_internalize(control, p)
 }
 
 int    unp_defer, unp_gcing;
 }
 
 int    unp_defer, unp_gcing;

-int    unp_mark();

 extern struct domain unixdomain;
 
 extern struct domain unixdomain;
 

+void

 unp_gc()
 {
        register struct file *fp, *nextfp;
 unp_gc()
 {
        register struct file *fp, *nextfp;


@@ -738,18 +741,19 @@ unp_gc()
        unp_gcing = 0;
 }
 
        unp_gcing = 0;
 }
 

+void

 unp_dispose(m)
        struct mbuf *m;
 {
 unp_dispose(m)
        struct mbuf *m;
 {

-       int unp_discard();

 
        if (m)
                unp_scan(m, unp_discard);
 }
 
 
        if (m)
                unp_scan(m, unp_discard);
 }
 

+void

 unp_scan(m0, op)
        register struct mbuf *m0;
 unp_scan(m0, op)
        register struct mbuf *m0;

-       int (*op)();
+       void (*op)();

 {
        register struct mbuf *m;
        register struct file **rp;
 {
        register struct mbuf *m;
        register struct file **rp;


@@ -776,6 +780,7 @@ unp_scan(m0, op)
        }
 }
 
        }
 }
 

+void

 unp_mark(fp)
        struct file *fp;
 {
 unp_mark(fp)
        struct file *fp;
 {


@@ -786,6 +791,7 @@ unp_mark(fp)
        fp->f_flag |= (FMARK|FDEFER);
 }
 
        fp->f_flag |= (FMARK|FDEFER);
 }
 

+void

 unp_discard(fp)
        struct file *fp;
 {
 unp_discard(fp)
        struct file *fp;
 {

diff --git a/usr/src/sys/kern/vfs_bio.c b/usr/src/sys/kern/vfs_bio.c
index 2b9568b..e842fe8 100644 (file)
--- a/usr/src/sys/kern/vfs_bio.c
+++ b/usr/src/sys/kern/vfs_bio.c
@@ -12,7 +12,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)vfs_bio.c   8.10 (Berkeley) %G%
+ *     @(#)vfs_bio.c   8.11 (Berkeley) %G%

  */
 
 #include <sys/param.h>
  */
 
 #include <sys/param.h>


@@ -320,6 +320,7 @@ vn_bwrite(ap)
  * NB: magnetic tapes cannot be delayed; they must be
  * written in the order that the writes are requested.
  */
  * NB: magnetic tapes cannot be delayed; they must be
  * written in the order that the writes are requested.
  */

+void

 bdwrite(bp)
        register struct buf *bp;
 {
 bdwrite(bp)
        register struct buf *bp;
 {


@@ -346,6 +347,7 @@ bdwrite(bp)
  * Start I/O on a buffer, but do not wait for it to complete.
  * The buffer is released when the I/O completes.
  */
  * Start I/O on a buffer, but do not wait for it to complete.
  * The buffer is released when the I/O completes.
  */

+void

 bawrite(bp)
        register struct buf *bp;
 {
 bawrite(bp)
        register struct buf *bp;
 {


@@ -362,6 +364,7 @@ bawrite(bp)
  * Release a buffer.
  * Even if the buffer is dirty, no I/O is started.
  */
  * Release a buffer.
  * Even if the buffer is dirty, no I/O is started.
  */

+void

 brelse(bp)
        register struct buf *bp;
 {
 brelse(bp)
        register struct buf *bp;
 {

diff --git a/usr/src/sys/kern/vfs_subr.c b/usr/src/sys/kern/vfs_subr.c
index 8ad421f..254de99 100644 (file)
--- a/usr/src/sys/kern/vfs_subr.c
+++ b/usr/src/sys/kern/vfs_subr.c
@@ -9,7 +9,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)vfs_subr.c  8.13 (Berkeley) %G%
+ *     @(#)vfs_subr.c  8.14 (Berkeley) %G%

  */
 
 /*
  */
 
 /*


@@ -1044,6 +1044,7 @@ loop:
 static char *typename[] =
    { "VNON", "VREG", "VDIR", "VBLK", "VCHR", "VLNK", "VSOCK", "VFIFO", "VBAD" };
 
 static char *typename[] =
    { "VNON", "VREG", "VDIR", "VBLK", "VCHR", "VLNK", "VSOCK", "VFIFO", "VBAD" };
 

+void

 vprint(label, vp)
        char *label;
        register struct vnode *vp;
 vprint(label, vp)
        char *label;
        register struct vnode *vp;

diff --git a/usr/src/sys/kern/vfs_vnops.c b/usr/src/sys/kern/vfs_vnops.c
index 37fb625..77f94e0 100644 (file)
--- a/usr/src/sys/kern/vfs_vnops.c
+++ b/usr/src/sys/kern/vfs_vnops.c
@@ -9,7 +9,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)vfs_vnops.c 8.5 (Berkeley) %G%
+ *     @(#)vfs_vnops.c 8.6 (Berkeley) %G%

  */
 
 #include <sys/param.h>
  */
 
 #include <sys/param.h>


@@ -333,7 +333,7 @@ vn_stat(vp, sb, p)
  */
 vn_ioctl(fp, com, data, p)
        struct file *fp;
  */
 vn_ioctl(fp, com, data, p)
        struct file *fp;

-       int com;
+       u_long com;

        caddr_t data;
        struct proc *p;
 {
        caddr_t data;
        struct proc *p;
 {