From: Ben Gras Date: Wed, 6 Jun 2007 14:48:18 +0000 (+0000) Subject: Not used in vfs. X-Git-Tag: v3.1.3a^2~2 X-Git-Url: http://zhaoyanbai.com/repos/%22http:/www.isc.org/icons/zlib_tech.html?a=commitdiff_plain;h=26cf8b90eab8238f8ec55c31a9f40a4e4f26fbbf;p=minix.git Not used in vfs. --- diff --git a/servers/vfs/const.h b/servers/vfs/const.h index 4894e234b..fb11fdff9 100644 --- a/servers/vfs/const.h +++ b/servers/vfs/const.h @@ -86,7 +86,6 @@ #define DIR_ENTRY_SIZE usizeof (struct direct) /* # bytes/dir entry */ #define NR_DIR_ENTRIES(b) ((b)/DIR_ENTRY_SIZE) /* # dir entries/blk */ -#define SUPER_SIZE usizeof (struct super_block) /* super_block size */ #define PIPE_SIZE(b) (V1_NR_DZONES*(b)) /* pipe size in bytes */ #define FS_BITMAP_CHUNKS(b) ((b)/usizeof (bitchunk_t))/* # map chunks/blk */ diff --git a/servers/vfs/inode.h b/servers/vfs/inode.h deleted file mode 100644 index 2e8ae8b08..000000000 --- a/servers/vfs/inode.h +++ /dev/null @@ -1,44 +0,0 @@ -/* Inode table. This table holds inodes that are currently in use. In some - * cases they have been opened by an open() or creat() system call, in other - * cases the file system itself needs the inode for one reason or another, - * such as to search a directory for a path name. - * The first part of the struct holds fields that are present on the - * disk; the second part holds fields not present on the disk. - * The disk inode part is also declared in "type.h" as 'd1_inode' for V1 - * file systems and 'd2_inode' for V2 file systems. - */ - -EXTERN struct inode { - mode_t i_mode; /* file type, protection, etc. */ - nlink_t i_nlinks; /* how many links to this file */ - uid_t i_uid; /* user id of the file's owner */ - gid_t i_gid; /* group number */ - off_t i_size; /* current file size in bytes */ - time_t i_atime; /* time of last access (V2 only) */ - time_t i_mtime; /* when was file data last changed */ - time_t i_ctime; /* when was inode itself changed (V2 only)*/ - zone_t i_zone[V2_NR_TZONES]; /* zone numbers for direct, ind, and dbl ind */ - - /* The following items are not present on the disk. */ - dev_t i_dev; /* which device is the inode on */ - ino_t i_num; /* inode number on its (minor) device */ - int i_count; /* # times inode used; 0 means slot is free */ - int i_ndzones; /* # direct zones (Vx_NR_DZONES) */ - int i_nindirs; /* # indirect zones per indirect block */ - struct super_block *i_sp; /* pointer to super block for inode's device */ - char i_dirt; /* CLEAN or DIRTY */ - char i_pipe; /* set to I_PIPE if pipe */ - char i_mount; /* this bit is set if file mounted on */ - char i_seek; /* set on LSEEK, cleared on READ/WRITE */ - char i_update; /* the ATIME, CTIME, and MTIME bits are here */ -} inode[NR_INODES]; - -#define NIL_INODE (struct inode *) 0 /* indicates absence of inode slot */ - -/* Field values. Note that CLEAN and DIRTY are defined in "const.h" */ -#define NO_PIPE 0 /* i_pipe is NO_PIPE if inode is not a pipe */ -#define I_PIPE 1 /* i_pipe is I_PIPE if inode is a pipe */ -#define NO_MOUNT 0 /* i_mount is NO_MOUNT if file not mounted on*/ -#define I_MOUNT 1 /* i_mount is I_MOUNT if file mounted on */ -#define NO_SEEK 0 /* i_seek = NO_SEEK if last op was not SEEK */ -#define ISEEK 1 /* i_seek = ISEEK if last op was SEEK */ diff --git a/servers/vfs/super.h b/servers/vfs/super.h deleted file mode 100644 index 035c87b38..000000000 --- a/servers/vfs/super.h +++ /dev/null @@ -1,59 +0,0 @@ -/* Super block table. The root file system and every mounted file system - * has an entry here. The entry holds information about the sizes of the bit - * maps and inodes. The s_ninodes field gives the number of inodes available - * for files and directories, including the root directory. Inode 0 is - * on the disk, but not used. Thus s_ninodes = 4 means that 5 bits will be - * used in the bit map, bit 0, which is always 1 and not used, and bits 1-4 - * for files and directories. The disk layout is: - * - * Item # blocks - * boot block 1 - * super block 1 (offset 1kB) - * inode map s_imap_blocks - * zone map s_zmap_blocks - * inodes (s_ninodes + 'inodes per block' - 1)/'inodes per block' - * unused whatever is needed to fill out the current zone - * data zones (s_zones - s_firstdatazone) << s_log_zone_size - * - * A super_block slot is free if s_dev == NO_DEV. - */ - -EXTERN struct super_block { - ino_t s_ninodes; /* # usable inodes on the minor device */ - zone1_t s_nzones; /* total device size, including bit maps etc */ - short s_imap_blocks; /* # of blocks used by inode bit map */ - short s_zmap_blocks; /* # of blocks used by zone bit map */ - zone1_t s_firstdatazone; /* number of first data zone */ - short s_log_zone_size; /* log2 of blocks/zone */ - short s_pad; /* try to avoid compiler-dependent padding */ - off_t s_max_size; /* maximum file size on this device */ - zone_t s_zones; /* number of zones (replaces s_nzones in V2) */ - short s_magic; /* magic number to recognize super-blocks */ - - /* The following items are valid on disk only for V3 and above */ - - /* The block size in bytes. Minimum MIN_BLOCK SIZE. SECTOR_SIZE - * multiple. If V1 or V2 filesystem, this should be - * initialised to STATIC_BLOCK_SIZE. Maximum MAX_BLOCK_SIZE. - */ - short s_pad2; /* try to avoid compiler-dependent padding */ - unsigned short s_block_size; /* block size in bytes. */ - char s_disk_version; /* filesystem format sub-version */ - - /* The following items are only used when the super_block is in memory. */ - struct inode *s_isup; /* inode for root dir of mounted file sys */ - struct inode *s_imount; /* inode mounted on */ - unsigned s_inodes_per_block; /* precalculated from magic number */ - dev_t s_dev; /* whose super block is this? */ - int s_rd_only; /* set to 1 iff file sys mounted read only */ - int s_native; /* set to 1 iff not byte swapped file system */ - int s_version; /* file system version, zero means bad magic */ - int s_ndzones; /* # direct zones in an inode */ - int s_nindirs; /* # indirect zones per indirect block */ - bit_t s_isearch; /* inodes below this bit number are in use */ - bit_t s_zsearch; /* all zones below this bit number are in use*/ -} super_block[NR_SUPERS]; - -#define NIL_SUPER (struct super_block *) 0 -#define IMAP 0 /* operating on the inode bit map */ -#define ZMAP 1 /* operating on the zone bit map */