ahp/busybox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

It is now possible to select in busybox.def.h whether minixfs version 2

Browse source 
is to be supported.
This commit is contained in:
Pavel Roskin 2000-07-17 17:52:00 +00:00
parent 47d4926244
commit bc0aed79a8
5 changed files with 63 additions and 72 deletions
Download patch file Download diff file Expand all files Collapse all files

24
util-linux/mkfs_minix.c
View file

@ -175,10 +175,6 @@ struct minix_dir_entry {
#endif
#ifdef MINIX2_SUPER_MAGIC2
#define HAVE_MINIX2 1
#endif
#ifndef __linux__
#define volatile
#endif
@ -191,7 +187,7 @@ struct minix_dir_entry {
#define UPPER(size,n) (((size)+((n)-1))/(n))
#define INODE_SIZE (sizeof(struct minix_inode))
#ifdef HAVE_MINIX2
#ifdef BB_FEATURE_MINIX2
#define INODE_SIZE2 (sizeof(struct minix2_inode))
#define INODE_BLOCKS UPPER(INODES, (version2 ? MINIX2_INODES_PER_BLOCK \
: MINIX_INODES_PER_BLOCK))
@ -219,7 +215,7 @@ static char root_block[BLOCK_SIZE] = "\0";
static char *inode_buffer = NULL;
#define Inode (((struct minix_inode *) inode_buffer)-1)
#ifdef HAVE_MINIX2
#ifdef BB_FEATURE_MINIX2
#define Inode2 (((struct minix2_inode *) inode_buffer)-1)
#endif
static char super_block_buffer[BLOCK_SIZE];
@ -227,7 +223,7 @@ static char boot_block_buffer[512];
#define Super (*(struct minix_super_block *)super_block_buffer)
#define INODES ((unsigned long)Super.s_ninodes)
#ifdef HAVE_MINIX2
#ifdef BB_FEATURE_MINIX2
#define ZONES ((unsigned long)(version2 ? Super.s_zones : Super.s_nzones))
#else
#define ZONES ((unsigned long)(Super.s_nzones))
@ -463,7 +459,7 @@ static void make_bad_inode(void)
write_block(dind, (char *) dind_block);
}
#ifdef HAVE_MINIX2
#ifdef BB_FEATURE_MINIX2
static void make_bad_inode2(void)
{
struct minix2_inode *inode = &Inode2[MINIX_BAD_INO];
@ -536,7 +532,7 @@ static void make_root_inode(void)
write_block(inode->i_zone[0], root_block);
}
#ifdef HAVE_MINIX2
#ifdef BB_FEATURE_MINIX2
static void make_root_inode2(void)
{
struct minix2_inode *inode = &Inode2[MINIX_ROOT_INO];
@ -577,7 +573,7 @@ static void setup_tables(void)
else
inodes = req_nr_inodes;
/* Round up inode count to fill block size */
#ifdef HAVE_MINIX2
#ifdef BB_FEATURE_MINIX2
if (version2)
inodes = ((inodes + MINIX2_INODES_PER_BLOCK - 1) &
~(MINIX2_INODES_PER_BLOCK - 1));
@ -729,7 +725,7 @@ extern int mkfs_minix_main(int argc, char **argv)
if (INODE_SIZE * MINIX_INODES_PER_BLOCK != BLOCK_SIZE)
die("bad inode size");
#ifdef HAVE_MINIX2
#ifdef BB_FEATURE_MINIX2
if (INODE_SIZE2 * MINIX2_INODES_PER_BLOCK != BLOCK_SIZE)
die("bad inode size");
#endif
@ -794,7 +790,7 @@ extern int mkfs_minix_main(int argc, char **argv)
break;
}
case 'v':
#ifdef HAVE_MINIX2
#ifdef BB_FEATURE_MINIX2
version2 = 1;
#else
errorMsg("%s: not compiled with minix v2 support\n",
@ -826,7 +822,7 @@ goodbye:
if (!device_name || BLOCKS < 10) {
show_usage();
}
#ifdef HAVE_MINIX2
#ifdef BB_FEATURE_MINIX2
if (version2) {
if (namelen == 14)
magic = MINIX2_SUPER_MAGIC;
@ -860,7 +856,7 @@ goodbye:
check_blocks();
else if (listfile)
get_list_blocks(listfile);
#ifdef HAVE_MINIX2
#ifdef BB_FEATURE_MINIX2
if (version2) {
make_root_inode2();
make_bad_inode2();