Index: uspace/app/mkminix/mfs.h =================================================================== --- uspace/app/mkminix/mfs.h (revision eaf9794d7e1bb9b69450660640ebcf1bb4c4b3e9) +++ (revision ) @@ -1,138 +1,0 @@ -/* - * Copyright (c) 2011 Maurizio Lombardi - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * - Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/** @addtogroup fs - * @{ - */ - -#ifndef _MFS_H_ -#define _MFS_H_ - -#include -#include - -#define MFS_ROOT_INO 1 -#define MFS_SUPER_BLOCK 0 -#define MFS_SUPER_BLOCK_SIZE 1024 - -#define MFS_MAX_BLOCK_SIZE 4096 -#define MFS_MIN_BLOCK_SIZE 1024 - -#define V2_NR_DIRECT_ZONES 7 -#define V2_NR_INDIRECT_ZONES 3 - -#define V1_NR_DIRECT_ZONES 7 -#define V1_NR_INDIRECT_ZONES 2 - -#define V1_MAX_NAME_LEN 14 -#define V2_MAX_NAME_LEN 14 -#define V3_MAX_NAME_LEN 60 - -#define MFS_MAGIC_V1 0x137F -#define MFS_MAGIC_V1R 0x7F13 - -#define MFS_MAGIC_V2 0x2468 -#define MFS_MAGIC_V2R 0x6824 - -#define MFS_MAGIC_V3 0x4D5A -#define MFS_MAGIC_V3R 0x5A4D - -#define MFS_VALID_FS 0x0001 -#define MFS_ERROR_FS 0x0002 - -struct mfs_superblock { - /*Total number of inodes on the device*/ - uint32_t s_ninodes; - /*Device size expressed as number of zones (unused)*/ - uint16_t s_nzones; - /*Number of inode bitmap blocks*/ - int16_t s_ibmap_blocks; - /*Number of zone bitmap blocks*/ - int16_t s_zbmap_blocks; - /*First data zone on device*/ - uint16_t s_first_data_zone; - /*Base 2 logarithm of the zone to block ratio*/ - int16_t s_log2_zone_size; - int16_t s_pad; - /*Maximum file size expressed in bytes*/ - int32_t s_max_file_size; - /*Total number of zones on the device*/ - uint32_t s_total_zones; - /*Magic number used to recognize MinixFS and to detect on-disk endianness*/ - int16_t s_magic; - - /* The following fields are valid only for MinixFS V3 */ - - int16_t s_pad2; - /*Filesystem block size expressed in bytes*/ - uint16_t s_block_size; - /*Filesystem disk format version*/ - int8_t s_disk_version; -} __attribute__ ((packed)); - -typedef enum { - MFS_VERSION_V1 = 1, - MFS_VERSION_V2, - MFS_VERSION_V3 -} mfs_version_t; - -/*MinixFS V1 inode structure as it is on disk*/ -struct mfs_v1_inode { - uint16_t i_mode; - int16_t i_uid; - int32_t i_size; - int32_t i_mtime; - uint8_t i_gid; - uint8_t i_nlinks; - /*Block numbers for direct zones*/ - uint16_t i_dzone[V1_NR_DIRECT_ZONES]; - /*Block numbers for indirect zones*/ - uint16_t i_izone[V1_NR_INDIRECT_ZONES]; -} __attribute__ ((packed)); - -/*MinixFS V2 inode structure as it is on disk.*/ -struct mfs_v2_inode { - uint16_t i_mode; - uint16_t i_nlinks; - int16_t i_uid; - uint16_t i_gid; - int32_t i_size; - int32_t i_atime; - int32_t i_mtime; - int32_t i_ctime; - /*Block numbers for direct zones*/ - uint32_t i_dzone[V2_NR_DIRECT_ZONES]; - /*Block numbers for indirect zones*/ - uint32_t i_izone[V2_NR_INDIRECT_ZONES]; -} __attribute__ ((packed)); - -#endif - -/** - * @} - */ Index: uspace/app/mkminix/mfs_const.h =================================================================== --- uspace/app/mkminix/mfs_const.h (revision 741368349972e65632e9ffcf2cbacbfc35ef503a) +++ uspace/app/mkminix/mfs_const.h (revision 741368349972e65632e9ffcf2cbacbfc35ef503a) @@ -0,0 +1,1 @@ +../../srv/fs/minixfs/mfs_const.h Index: uspace/app/mkminix/mfs_inode.h =================================================================== --- uspace/app/mkminix/mfs_inode.h (revision 741368349972e65632e9ffcf2cbacbfc35ef503a) +++ uspace/app/mkminix/mfs_inode.h (revision 741368349972e65632e9ffcf2cbacbfc35ef503a) @@ -0,0 +1,1 @@ +../../srv/fs/minixfs/mfs_inode.h Index: uspace/app/mkminix/mfs_super.h =================================================================== --- uspace/app/mkminix/mfs_super.h (revision 741368349972e65632e9ffcf2cbacbfc35ef503a) +++ uspace/app/mkminix/mfs_super.h (revision 741368349972e65632e9ffcf2cbacbfc35ef503a) @@ -0,0 +1,1 @@ +../../srv/fs/minixfs/mfs_super.h Index: uspace/app/mkminix/mkminix.c =================================================================== --- uspace/app/mkminix/mkminix.c (revision eaf9794d7e1bb9b69450660640ebcf1bb4c4b3e9) +++ uspace/app/mkminix/mkminix.c (revision 741368349972e65632e9ffcf2cbacbfc35ef503a) @@ -48,5 +48,7 @@ #include #include -#include "mfs.h" +#include "mfs_const.h" +#include "mfs_inode.h" +#include "mfs_super.h" #define NAME "mkminix" @@ -84,7 +86,4 @@ size_t devblock_size; unsigned long n_inodes = 0; - - struct mfs_superblock *sb; - sb = (struct mfs_superblock *) malloc(sizeof(struct mfs_superblock)); if (argc == 1) {