move IFMT => VTYPE and VTYPE => IFMT to vnode since stat requires it

SCCS-vsn: sys/ufs/ffs/inode.h 7.22
SCCS-vsn: sys/ufs/ufs/inode.h 7.22
SCCS-vsn: sys/ufs/ffs/ufs_vnops.c 7.76
SCCS-vsn: sys/ufs/ufs/ufs_vnops.c 7.76

diff --git a/usr/src/sys/ufs/ffs/inode.h b/usr/src/sys/ufs/ffs/inode.h
index 131d459..ae06ac2 100644 (file)
--- a/usr/src/sys/ufs/ffs/inode.h
+++ b/usr/src/sys/ufs/ffs/inode.h
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)inode.h     7.21 (Berkeley) %G%
+ *     @(#)inode.h     7.22 (Berkeley) %G%

  */
 
 #include <ufs/ufs/dinode.h>
  */
 
 #include <ufs/ufs/dinode.h>


@@ -97,14 +97,6 @@ struct inode {
 #define VTOI(vp)       ((struct inode *)(vp)->v_data)
 #define ITOV(ip)       ((ip)->i_vnode)
 
 #define VTOI(vp)       ((struct inode *)(vp)->v_data)
 #define ITOV(ip)       ((ip)->i_vnode)
 

-/* Convert between vnode types and inode formats. */
-extern enum vtype      iftovt_tab[];
-extern int             vttoif_tab[];
-#define IFTOVT(mode)   (iftovt_tab[((mode) & IFMT) >> 12])
-#define VTTOIF(indx)   (vttoif_tab[(int)(indx)])
-
-#define MAKEIMODE(indx, mode)  (int)(VTTOIF(indx) | (mode))
-

 /* Lock and unlock inodes. */
 #ifdef notdef
 #define        ILOCK(ip) { \
 /* Lock and unlock inodes. */
 #ifdef notdef
 #define        ILOCK(ip) { \

diff --git a/usr/src/sys/ufs/ffs/ufs_vnops.c b/usr/src/sys/ufs/ffs/ufs_vnops.c
index 638eb1f..faeac70 100644 (file)
--- a/usr/src/sys/ufs/ffs/ufs_vnops.c
+++ b/usr/src/sys/ufs/ffs/ufs_vnops.c
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)ufs_vnops.c 7.75 (Berkeley) %G%
+ *     @(#)ufs_vnops.c 7.76 (Berkeley) %G%

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


@@ -33,14 +33,6 @@
 int ufs_chmod __P((struct vnode *, int, struct proc *));
 int ufs_chown __P((struct vnode *, u_int, u_int, struct proc *));
 
 int ufs_chmod __P((struct vnode *, int, struct proc *));
 int ufs_chown __P((struct vnode *, u_int, u_int, struct proc *));
 

-enum vtype iftovt_tab[16] = {
-       VNON, VFIFO, VCHR, VNON, VDIR, VNON, VBLK, VNON,
-       VREG, VNON, VLNK, VNON, VSOCK, VNON, VNON, VBAD,
-};
-int    vttoif_tab[9] = {
-       0, IFREG, IFDIR, IFBLK, IFCHR, IFLNK, IFSOCK, IFIFO, IFMT,
-};
-

 #ifdef _NOQUAD
 #define        SETHIGH(q, h)   (q).val[_QUAD_HIGHWORD] = (h)
 #define        SETLOW(q, l)    (q).val[_QUAD_LOWWORD] = (l)
 #ifdef _NOQUAD
 #define        SETHIGH(q, h)   (q).val[_QUAD_HIGHWORD] = (h)
 #define        SETLOW(q, l)    (q).val[_QUAD_LOWWORD] = (l)

diff --git a/usr/src/sys/ufs/ufs/inode.h b/usr/src/sys/ufs/ufs/inode.h
index 131d459..ae06ac2 100644 (file)
--- a/usr/src/sys/ufs/ufs/inode.h
+++ b/usr/src/sys/ufs/ufs/inode.h
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)inode.h     7.21 (Berkeley) %G%
+ *     @(#)inode.h     7.22 (Berkeley) %G%

  */
 
 #include <ufs/ufs/dinode.h>
  */
 
 #include <ufs/ufs/dinode.h>


@@ -97,14 +97,6 @@ struct inode {
 #define VTOI(vp)       ((struct inode *)(vp)->v_data)
 #define ITOV(ip)       ((ip)->i_vnode)
 
 #define VTOI(vp)       ((struct inode *)(vp)->v_data)
 #define ITOV(ip)       ((ip)->i_vnode)
 

-/* Convert between vnode types and inode formats. */
-extern enum vtype      iftovt_tab[];
-extern int             vttoif_tab[];
-#define IFTOVT(mode)   (iftovt_tab[((mode) & IFMT) >> 12])
-#define VTTOIF(indx)   (vttoif_tab[(int)(indx)])
-
-#define MAKEIMODE(indx, mode)  (int)(VTTOIF(indx) | (mode))
-

 /* Lock and unlock inodes. */
 #ifdef notdef
 #define        ILOCK(ip) { \
 /* Lock and unlock inodes. */
 #ifdef notdef
 #define        ILOCK(ip) { \

diff --git a/usr/src/sys/ufs/ufs/ufs_vnops.c b/usr/src/sys/ufs/ufs/ufs_vnops.c
index 638eb1f..faeac70 100644 (file)
--- a/usr/src/sys/ufs/ufs/ufs_vnops.c
+++ b/usr/src/sys/ufs/ufs/ufs_vnops.c
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)ufs_vnops.c 7.75 (Berkeley) %G%
+ *     @(#)ufs_vnops.c 7.76 (Berkeley) %G%

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


@@ -33,14 +33,6 @@
 int ufs_chmod __P((struct vnode *, int, struct proc *));
 int ufs_chown __P((struct vnode *, u_int, u_int, struct proc *));
 
 int ufs_chmod __P((struct vnode *, int, struct proc *));
 int ufs_chown __P((struct vnode *, u_int, u_int, struct proc *));
 

-enum vtype iftovt_tab[16] = {
-       VNON, VFIFO, VCHR, VNON, VDIR, VNON, VBLK, VNON,
-       VREG, VNON, VLNK, VNON, VSOCK, VNON, VNON, VBAD,
-};
-int    vttoif_tab[9] = {
-       0, IFREG, IFDIR, IFBLK, IFCHR, IFLNK, IFSOCK, IFIFO, IFMT,
-};
-

 #ifdef _NOQUAD
 #define        SETHIGH(q, h)   (q).val[_QUAD_HIGHWORD] = (h)
 #define        SETLOW(q, l)    (q).val[_QUAD_LOWWORD] = (l)
 #ifdef _NOQUAD
 #define        SETHIGH(q, h)   (q).val[_QUAD_HIGHWORD] = (h)
 #define        SETLOW(q, l)    (q).val[_QUAD_LOWWORD] = (l)