ufs_vinit prototype changed for new vn_if

[unix-history] / usr / src / sys / ufs / ffs / dinode.h

diff --git a/usr/src/sys/ufs/ffs/dinode.h b/usr/src/sys/ufs/ffs/dinode.h
index 2ee1932..40c61f4 100644 (file)
--- a/usr/src/sys/ufs/ffs/dinode.h
+++ b/usr/src/sys/ufs/ffs/dinode.h
@@ -4,56 +4,70 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)dinode.h    7.9 (Berkeley) %G%
+ *     @(#)dinode.h    7.14 (Berkeley) %G%

  */
 
 /*
  */
 
 /*

- * This structure defines the on-disk format of an inode.
+ * The root inode is the root of the file system.  Inode 0 can't be used for
+ * normal purposes and historically bad blocks were linked to inode 1, thus
+ * the root inode is 2.  (Inode 1 is no longer used for this purpose, however
+ * numerous dump tapes make this assumption, so we are stuck with it).
+ */
+#define        ROOTINO ((ino_t)2)
+
+/*
+ * A dinode contains all the meta-data associated with a UFS file.
+ * This structure defines the on-disk format of a dinode.

  */
 
 #define        NDADDR  12              /* direct addresses in inode */
 #define        NIADDR  3               /* indirect addresses in inode */
 
 struct dinode {
  */
 
 #define        NDADDR  12              /* direct addresses in inode */
 #define        NIADDR  3               /* indirect addresses in inode */
 
 struct dinode {

-       u_short di_mode;        /*  0: mode and type of file */
-       short   di_nlink;       /*  2: number of links to file */
-       uid_t   di_uid;         /*  4: owner's user id */
-       gid_t   di_gid;         /*  6: owner's group id */
-       u_quad  di_qsize;       /*  8: number of bytes in file */
-       time_t  di_atime;       /* 16: time last accessed */
-       long    di_atspare;
-       time_t  di_mtime;       /* 24: time last modified */
-       long    di_mtspare;
-       time_t  di_ctime;       /* 32: last time inode changed */
-       long    di_ctspare;
-       daddr_t di_db[NDADDR];  /* 40: disk block addresses */
-       daddr_t di_ib[NIADDR];  /* 88: indirect blocks */
-       long    di_flags;       /* 100: status, currently unused */
-       long    di_blocks;      /* 104: blocks actually held */
-       long    di_gen;         /* 108: generation number */
-       long    di_spare[4];    /* 112: reserved, currently unused */
+       u_short         di_mode;        /*   0: mode and type of file */
+       short           di_nlink;       /*   2: number of links to file */
+       u_short         di_ouid;        /*   4: old owner's user id */
+       u_short         di_ogid;        /*   6: old owner's group id */
+       u_quad_t        di_qsize;       /*   8: number of bytes in file */
+       struct timeval  di_atime;       /*  16: time last accessed */
+       struct timeval  di_mtime;       /*  24: time last modified */
+       struct timeval  di_ctime;       /*  32: last time inode changed */
+       daddr_t         di_db[NDADDR];  /*  40: disk block addresses */
+       daddr_t         di_ib[NIADDR];  /*  88: indirect blocks */
+       long            di_flags;       /* 100: status, currently unused */
+       long            di_blocks;      /* 104: blocks actually held */
+       long            di_gen;         /* 108: generation number */
+       u_long          di_uid;         /* 112: owner's user id */
+       u_long          di_gid;         /* 116: owner's group id */
+       long            di_spare[2];    /* 120: reserved, currently unused */

 };
 
 };
 

-#if BYTE_ORDER == LITTLE_ENDIAN || defined(tahoe) /* ugh! -- must be fixed */
+#ifdef _NOQUAD
+#define di_size        di_qsize.val[_QUAD_LOWWORD]
+#else
+#define di_size        di_qsize
+#endif
+
+#if defined(tahoe) /* ugh! -- must be fixed */
+#undef di_size

 #define        di_size         di_qsize.val[0]
 #define        di_size         di_qsize.val[0]

-#else /* BYTE_ORDER == BIG_ENDIAN */
-#define        di_size         di_qsize.val[1]

 #endif
 #endif

+

 #define        di_rdev         di_db[0]
 
 /* file modes */
 #define        di_rdev         di_db[0]
 
 /* file modes */

-#define        IFMT            0170000         /* type of file */
+#define        IFMT            0170000         /* mask of file type */

 #define        IFIFO           0010000         /* named pipe (fifo) */
 #define        IFIFO           0010000         /* named pipe (fifo) */

-#define        IFCHR           0020000         /* character special */
+#define        IFCHR           0020000         /* character special device */

 #define        IFDIR           0040000         /* directory */
 #define        IFDIR           0040000         /* directory */

-#define        IFBLK           0060000         /* block special */
-#define        IFREG           0100000         /* regular */
+#define        IFBLK           0060000         /* block special device */
+#define        IFREG           0100000         /* regular file */

 #define        IFLNK           0120000         /* symbolic link */
 #define        IFLNK           0120000         /* symbolic link */

-#define        IFSOCK          0140000         /* socket */
-
-#define        ISUID           04000           /* set user id on execution */
-#define        ISGID           02000           /* set group id on execution */
-#define        ISVTX           01000           /* save swapped text even after use */
-#define        IREAD           0400            /* read, write, execute permissions */
-#define        IWRITE          0200
-#define        IEXEC           0100
+#define        IFSOCK          0140000         /* UNIX domain socket */
+
+#define        ISUID           04000           /* set user identifier when exec'ing */
+#define        ISGID           02000           /* set group identifier when exec'ing */
+#define        ISVTX           01000           /* save execution information on exit */
+#define        IREAD           0400            /* read permission */
+#define        IWRITE          0200            /* write permission */
+#define        IEXEC           0100            /* execute permission */