From ef5464f2adaad0b15be46dc9166c77e732cbc6fc Mon Sep 17 00:00:00 2001
From: Kirk McKusick <mckusick@ucbvax.Berkeley.EDU>
Date: Fri, 7 Feb 1992 01:54:53 -0800
Subject: [PATCH] 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
---
 usr/src/sys/ufs/ffs/inode.h     | 10 +---------
 usr/src/sys/ufs/ffs/ufs_vnops.c | 10 +---------
 usr/src/sys/ufs/ufs/inode.h     | 10 +---------
 usr/src/sys/ufs/ufs/ufs_vnops.c | 10 +---------
 4 files changed, 4 insertions(+), 36 deletions(-)

diff --git a/usr/src/sys/ufs/ffs/inode.h b/usr/src/sys/ufs/ffs/inode.h
index 131d459332..ae06ac20be 100644
--- a/usr/src/sys/ufs/ffs/inode.h
+++ b/usr/src/sys/ufs/ffs/inode.h
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
- *	@(#)inode.h	7.21 (Berkeley) %G%
+ *	@(#)inode.h	7.22 (Berkeley) %G%
  */
 
 #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)
 
-/* 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) { \
diff --git a/usr/src/sys/ufs/ffs/ufs_vnops.c b/usr/src/sys/ufs/ffs/ufs_vnops.c
index 638eb1facb..faeac70574 100644
--- 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%
  *
- *	@(#)ufs_vnops.c	7.75 (Berkeley) %G%
+ *	@(#)ufs_vnops.c	7.76 (Berkeley) %G%
  */
 
 #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 *));
 
-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)
diff --git a/usr/src/sys/ufs/ufs/inode.h b/usr/src/sys/ufs/ufs/inode.h
index 131d459332..ae06ac20be 100644
--- a/usr/src/sys/ufs/ufs/inode.h
+++ b/usr/src/sys/ufs/ufs/inode.h
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
- *	@(#)inode.h	7.21 (Berkeley) %G%
+ *	@(#)inode.h	7.22 (Berkeley) %G%
  */
 
 #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)
 
-/* 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) { \
diff --git a/usr/src/sys/ufs/ufs/ufs_vnops.c b/usr/src/sys/ufs/ufs/ufs_vnops.c
index 638eb1facb..faeac70574 100644
--- 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%
  *
- *	@(#)ufs_vnops.c	7.75 (Berkeley) %G%
+ *	@(#)ufs_vnops.c	7.76 (Berkeley) %G%
  */
 
 #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 *));
 
-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)
-- 
2.20.1