diff --git a/usr.sbin/mkfs.mfs/const.h b/usr.sbin/mkfs.mfs/const.h index 863fe20d0..b4c1cd008 100644 --- a/usr.sbin/mkfs.mfs/const.h +++ b/usr.sbin/mkfs.mfs/const.h @@ -2,8 +2,6 @@ #define __MFS_CONST_H__ /* Tables sizes */ -#define V1_NR_DZONES 7 /* # direct zone numbers in a V1 inode */ -#define V1_NR_TZONES 9 /* total # zone numbers in a V1 inode */ #define V2_NR_DZONES 7 /* # direct zone numbers in a V2 inode */ #define V2_NR_TZONES 10 /* total # zone numbers in a V2 inode */ @@ -82,16 +80,6 @@ #define FS_BITCHUNK_BITS (usizeof(uint32_t) * CHAR_BIT) #define FS_BITS_PER_BLOCK(b) (FS_BITMAP_CHUNKS(b) * FS_BITCHUNK_BITS) -/* Derived sizes pertaining to the V1 file system. */ -#define V1_ZONE_NUM_SIZE usizeof (uint16_t) /* # bytes in V1 zone */ -#define V1_INODE_SIZE usizeof (d1_inode) /* bytes in V1 dsk ino */ - -/* # zones/indir block */ -#define V1_INDIRECTS (_STATIC_BLOCK_SIZE/V1_ZONE_NUM_SIZE) - -/* # V1 dsk inodes/blk */ -#define V1_INODES_PER_BLOCK (_STATIC_BLOCK_SIZE/V1_INODE_SIZE) - /* Derived sizes pertaining to the V2 file system. */ #define V2_ZONE_NUM_SIZE usizeof (uint32_t) /* # bytes in V2 zone */ #define V2_INODE_SIZE usizeof (d2_inode) /* bytes in V2 dsk ino */ diff --git a/usr.sbin/mkfs.mfs/type.h b/usr.sbin/mkfs.mfs/type.h index 2c65282b1..22e12b102 100644 --- a/usr.sbin/mkfs.mfs/type.h +++ b/usr.sbin/mkfs.mfs/type.h @@ -1,16 +1,6 @@ #ifndef __MFS_TYPE_H__ #define __MFS_TYPE_H__ -/* Declaration of the V1 inode as it is on the disk (not in core). */ -typedef struct { /* V1.x disk inode */ - uint16_t d1_mode; /* file type, protection, etc. */ - int16_t d1_uid; /* user id of the file's owner */ - int32_t d1_size; /* current file size in bytes */ - int32_t d1_mtime; /* when was file data last changed */ - uint8_t d1_gid; /* group number */ - uint8_t d1_nlinks; /* how many links to this file */ - uint16_t d1_zone[V1_NR_TZONES];/* block nums for direct, ind, and dbl ind */ -} d1_inode; /* Declaration of the V2 inode as it is on the disk (not in core). */ typedef struct { /* V2.x disk inode */