static void
read_block(unsigned int nr, char * addr) {
if (!nr) {
- memset(addr,0,BLOCK_SIZE);
+ memset(addr,0,MINIX_BLOCK_SIZE);
return;
}
- if (BLOCK_SIZE*nr != lseek(IN, BLOCK_SIZE*nr, SEEK_SET)) {
+ if (MINIX_BLOCK_SIZE*nr != lseek(IN, MINIX_BLOCK_SIZE*nr, SEEK_SET)) {
get_current_name();
printf(_("Read error: unable to seek to block in file '%s'\n"),
current_name);
- memset(addr,0,BLOCK_SIZE);
+ memset(addr,0,MINIX_BLOCK_SIZE);
errors_uncorrected = 1;
- } else if (BLOCK_SIZE != read(IN, addr, BLOCK_SIZE)) {
+ } else if (MINIX_BLOCK_SIZE != read(IN, addr, MINIX_BLOCK_SIZE)) {
get_current_name();
printf(_("Read error: bad block in file '%s'\n"),
current_name);
- memset(addr,0,BLOCK_SIZE);
+ memset(addr,0,MINIX_BLOCK_SIZE);
errors_uncorrected = 1;
}
}
errors_uncorrected = 1;
return;
}
- if (BLOCK_SIZE*nr != lseek(IN, BLOCK_SIZE*nr, SEEK_SET))
+ if (MINIX_BLOCK_SIZE*nr != lseek(IN, MINIX_BLOCK_SIZE*nr, SEEK_SET))
die(_("seek failed in write_block"));
- if (BLOCK_SIZE != write(IN, addr, BLOCK_SIZE)) {
+ if (MINIX_BLOCK_SIZE != write(IN, addr, MINIX_BLOCK_SIZE)) {
get_current_name();
printf(_("Write error: bad block in file '%s'\n"),
current_name);
*/
static int
map_block(struct minix_inode * inode, unsigned int blknr) {
- unsigned short ind[BLOCK_SIZE>>1];
- unsigned short dind[BLOCK_SIZE>>1];
+ unsigned short ind[MINIX_BLOCK_SIZE>>1];
+ unsigned short dind[MINIX_BLOCK_SIZE>>1];
int blk_chg, block, result;
if (blknr<7)
static int
map_block2 (struct minix2_inode *inode, unsigned int blknr) {
- unsigned int ind[BLOCK_SIZE >> 2];
- unsigned int dind[BLOCK_SIZE >> 2];
- unsigned int tind[BLOCK_SIZE >> 2];
+ unsigned int ind[MINIX_BLOCK_SIZE >> 2];
+ unsigned int dind[MINIX_BLOCK_SIZE >> 2];
+ unsigned int tind[MINIX_BLOCK_SIZE >> 2];
int blk_chg, block, result;
if (blknr < 7)
else
Super.s_state &= ~MINIX_ERROR_FS;
- if (BLOCK_SIZE != lseek(IN, BLOCK_SIZE, SEEK_SET))
+ if (MINIX_BLOCK_SIZE != lseek(IN, MINIX_BLOCK_SIZE, SEEK_SET))
die(_("seek failed in write_super_block"));
- if (BLOCK_SIZE != write(IN, super_block_buffer, BLOCK_SIZE))
+ if (MINIX_BLOCK_SIZE != write(IN, super_block_buffer, MINIX_BLOCK_SIZE))
die(_("unable to write super-block"));
return;
unsigned long imaps = get_nimaps();
unsigned long zmaps = get_nzmaps();
- if (imaps*BLOCK_SIZE != write(IN,inode_map, imaps*BLOCK_SIZE))
+ if (imaps*MINIX_BLOCK_SIZE != write(IN,inode_map, imaps*MINIX_BLOCK_SIZE))
die(_("Unable to write inode map"));
- if (zmaps*BLOCK_SIZE != write(IN,zone_map, zmaps*BLOCK_SIZE))
+ if (zmaps*MINIX_BLOCK_SIZE != write(IN,zone_map, zmaps*MINIX_BLOCK_SIZE))
die(_("Unable to write zone map"));
if (buffsz != write(IN,inode_buffer, buffsz))
die(_("Unable to write inodes"));
static void
get_dirsize (void) {
int block;
- char blk[BLOCK_SIZE];
+ char blk[MINIX_BLOCK_SIZE];
int size;
if (fs_version == 2)
else
block = Inode[ROOT_INO].i_zone[0];
read_block (block, blk);
- for (size = 16; size < BLOCK_SIZE; size <<= 1) {
+ for (size = 16; size < MINIX_BLOCK_SIZE; size <<= 1) {
if (strcmp (blk + size + 2, "..") == 0) {
dirsize = size;
namelen = size - 2;
static void
read_superblock(void) {
- if (BLOCK_SIZE != lseek(IN, BLOCK_SIZE, SEEK_SET))
+ if (MINIX_BLOCK_SIZE != lseek(IN, MINIX_BLOCK_SIZE, SEEK_SET))
die(_("seek failed"));
- super_block_buffer = calloc(1, BLOCK_SIZE);
+ super_block_buffer = calloc(1, MINIX_BLOCK_SIZE);
if (!super_block_buffer)
die(_("unable to alloc buffer for superblock"));
- if (BLOCK_SIZE != read(IN, super_block_buffer, BLOCK_SIZE))
+ if (MINIX_BLOCK_SIZE != read(IN, super_block_buffer, MINIX_BLOCK_SIZE))
die(_("unable to read super block"));
if (MAGIC == MINIX_SUPER_MAGIC) {
namelen = 14;
fs_version = 2;
} else
die(_("bad magic number in super-block"));
- if (get_zone_size() != 0 || BLOCK_SIZE != 1024)
+ if (get_zone_size() != 0 || MINIX_BLOCK_SIZE != 1024)
die(_("Only 1k blocks/zones supported"));
- if (get_nimaps() * BLOCK_SIZE * 8 < get_ninodes() + 1)
+ if (get_nimaps() * MINIX_BLOCK_SIZE * 8 < get_ninodes() + 1)
die(_("bad s_imap_blocks field in super-block"));
- if (get_nzmaps() * BLOCK_SIZE * 8 < get_nzones() - get_first_zone() + 1)
+ if (get_nzmaps() * MINIX_BLOCK_SIZE * 8 < get_nzones() - get_first_zone() + 1)
die(_("bad s_zmap_blocks field in super-block"));
}
unsigned long imaps = get_nimaps();
unsigned long zmaps = get_nzmaps();
- inode_map = malloc(imaps * BLOCK_SIZE);
+ inode_map = malloc(imaps * MINIX_BLOCK_SIZE);
if (!inode_map)
die(_("Unable to allocate buffer for inode map"));
- zone_map = malloc(zmaps * BLOCK_SIZE);
+ zone_map = malloc(zmaps * MINIX_BLOCK_SIZE);
if (!inode_map)
die(_("Unable to allocate buffer for zone map"));
memset(inode_map,0,sizeof(inode_map));
zone_count = malloc(zones);
if (!zone_count)
die(_("Unable to allocate buffer for zone count"));
- if (imaps*BLOCK_SIZE != read(IN,inode_map,imaps*BLOCK_SIZE))
+ if (imaps*MINIX_BLOCK_SIZE != read(IN,inode_map,imaps*MINIX_BLOCK_SIZE))
die(_("Unable to read inode map"));
- if (zmaps*BLOCK_SIZE != read(IN,zone_map, zmaps*BLOCK_SIZE))
+ if (zmaps*MINIX_BLOCK_SIZE != read(IN,zone_map, zmaps*MINIX_BLOCK_SIZE))
die(_("Unable to read zone map"));
if (buffsz != read(IN,inode_buffer, buffsz))
die(_("Unable to read inodes"));
printf(_("%ld inodes\n"), inodes);
printf(_("%ld blocks\n"), zones);
printf(_("Firstdatazone=%ld (%ld)\n"), first_zone, norm_first_zone);
- printf(_("Zonesize=%d\n"),BLOCK_SIZE<<get_zone_size());
+ printf(_("Zonesize=%d\n"),MINIX_BLOCK_SIZE<<get_zone_size());
printf(_("Maxsize=%ld\n"), get_max_size());
printf(_("Filesystem state=%d\n"), Super.s_state);
printf(_("namelen=%d\n\n"),namelen);
static void
add_zone_ind(unsigned short * znr, int * corrected) {
- static char blk[BLOCK_SIZE];
+ static char blk[MINIX_BLOCK_SIZE];
int i, chg_blk=0;
int block;
if (!block)
return;
read_block(block, blk);
- for (i=0 ; i < (BLOCK_SIZE>>1) ; i++)
+ for (i=0 ; i < (MINIX_BLOCK_SIZE>>1) ; i++)
add_zone(i + (unsigned short *) blk, &chg_blk);
if (chg_blk)
write_block(block, blk);
static void
add_zone_ind2 (unsigned int *znr, int *corrected) {
- static char blk[BLOCK_SIZE];
+ static char blk[MINIX_BLOCK_SIZE];
int i, chg_blk = 0;
int block;
if (!block)
return;
read_block (block, blk);
- for (i = 0; i < BLOCK_SIZE >> 2; i++)
+ for (i = 0; i < MINIX_BLOCK_SIZE >> 2; i++)
add_zone2 (i + (unsigned int *) blk, &chg_blk);
if (chg_blk)
write_block (block, blk);
static void
add_zone_dind(unsigned short * znr, int * corrected) {
- static char blk[BLOCK_SIZE];
+ static char blk[MINIX_BLOCK_SIZE];
int i, blk_chg=0;
int block;
if (!block)
return;
read_block(block, blk);
- for (i=0 ; i < (BLOCK_SIZE>>1) ; i++)
+ for (i=0 ; i < (MINIX_BLOCK_SIZE>>1) ; i++)
add_zone_ind(i + (unsigned short *) blk, &blk_chg);
if (blk_chg)
write_block(block, blk);
static void
add_zone_dind2 (unsigned int *znr, int *corrected) {
- static char blk[BLOCK_SIZE];
+ static char blk[MINIX_BLOCK_SIZE];
int i, blk_chg = 0;
int block;
if (!block)
return;
read_block (block, blk);
- for (i = 0; i < BLOCK_SIZE >> 2; i++)
+ for (i = 0; i < MINIX_BLOCK_SIZE >> 2; i++)
add_zone_ind2 (i + (unsigned int *) blk, &blk_chg);
if (blk_chg)
write_block (block, blk);
static void
add_zone_tind2 (unsigned int *znr, int *corrected) {
- static char blk[BLOCK_SIZE];
+ static char blk[MINIX_BLOCK_SIZE];
int i, blk_chg = 0;
int block;
if (!block)
return;
read_block (block, blk);
- for (i = 0; i < BLOCK_SIZE >> 2; i++)
+ for (i = 0; i < MINIX_BLOCK_SIZE >> 2; i++)
add_zone_dind2 (i + (unsigned int *) blk, &blk_chg);
if (blk_chg)
write_block (block, blk);
static void
check_file(struct minix_inode * dir, unsigned int offset) {
- static char blk[BLOCK_SIZE];
+ static char blk[MINIX_BLOCK_SIZE];
struct minix_inode * inode;
int ino;
char * name;
int block;
- block = map_block(dir,offset/BLOCK_SIZE);
+ block = map_block(dir,offset/MINIX_BLOCK_SIZE);
read_block(block, blk);
- name = blk + (offset % BLOCK_SIZE) + 2;
+ name = blk + (offset % MINIX_BLOCK_SIZE) + 2;
ino = * (unsigned short *) (name-2);
if (ino > get_ninodes()) {
get_current_name();
static void
check_file2 (struct minix2_inode *dir, unsigned int offset) {
- static char blk[BLOCK_SIZE];
+ static char blk[MINIX_BLOCK_SIZE];
struct minix2_inode *inode;
int ino;
char *name;
int block;
- block = map_block2 (dir, offset / BLOCK_SIZE);
+ block = map_block2 (dir, offset / MINIX_BLOCK_SIZE);
read_block (block, blk);
- name = blk + (offset % BLOCK_SIZE) + 2;
+ name = blk + (offset % MINIX_BLOCK_SIZE) + 2;
ino = *(unsigned short *) (name - 2);
if (ino > get_ninodes()) {
get_current_name();
bad_zone(int i) {
char buffer[1024];
- if (BLOCK_SIZE*i != lseek(IN, BLOCK_SIZE*i, SEEK_SET))
+ if (MINIX_BLOCK_SIZE*i != lseek(IN, MINIX_BLOCK_SIZE*i, SEEK_SET))
die(_("seek failed in bad_zone"));
- return (BLOCK_SIZE != read(IN, buffer, BLOCK_SIZE));
+ return (MINIX_BLOCK_SIZE != read(IN, buffer, MINIX_BLOCK_SIZE));
}
static void
exit(0);
}
- if (INODE_SIZE * MINIX_INODES_PER_BLOCK != BLOCK_SIZE)
+ if (INODE_SIZE * MINIX_INODES_PER_BLOCK != MINIX_BLOCK_SIZE)
die(_("bad inode size"));
- if (INODE2_SIZE * MINIX2_INODES_PER_BLOCK != BLOCK_SIZE)
+ if (INODE2_SIZE * MINIX2_INODES_PER_BLOCK != MINIX_BLOCK_SIZE)
die(_("bad v2 inode size"));
while (argc-- > 1) {
static int magic = MINIX_SUPER_MAGIC2;
static int version2 = 0;
-static char root_block[BLOCK_SIZE] = "\0";
+static char root_block[MINIX_BLOCK_SIZE] = "\0";
static char boot_block_buffer[512];
#define Super (*(struct minix_super_block *)super_block_buffer)
" in write_tables"), device_name);
if (512 != write(DEV, boot_block_buffer, 512))
err(MKFS_ERROR, _("%s: unable to clear boot sector"), device_name);
- if (BLOCK_SIZE != lseek(DEV, BLOCK_SIZE, SEEK_SET))
+ if (MINIX_BLOCK_SIZE != lseek(DEV, MINIX_BLOCK_SIZE, SEEK_SET))
err(MKFS_ERROR, _("%s: seek failed in write_tables"), device_name);
- if (BLOCK_SIZE != write(DEV, super_block_buffer, BLOCK_SIZE))
+ if (MINIX_BLOCK_SIZE != write(DEV, super_block_buffer, MINIX_BLOCK_SIZE))
err(MKFS_ERROR, _("%s: unable to write super-block"), device_name);
- if (imaps*BLOCK_SIZE != write(DEV,inode_map, imaps*BLOCK_SIZE))
+ if (imaps*MINIX_BLOCK_SIZE != write(DEV,inode_map, imaps*MINIX_BLOCK_SIZE))
err(MKFS_ERROR, _("%s: unable to write inode map"), device_name);
- if (zmaps*BLOCK_SIZE != write(DEV,zone_map, zmaps*BLOCK_SIZE))
+ if (zmaps*MINIX_BLOCK_SIZE != write(DEV,zone_map, zmaps*MINIX_BLOCK_SIZE))
err(MKFS_ERROR, _("%s: unable to write zone map"), device_name);
if (buffsz != write(DEV,inode_buffer, buffsz))
err(MKFS_ERROR, _("%s: unable to write inodes"), device_name);
}
static void write_block(int blk, char * buffer) {
- if (blk*BLOCK_SIZE != lseek(DEV, blk*BLOCK_SIZE, SEEK_SET))
+ if (blk*MINIX_BLOCK_SIZE != lseek(DEV, blk*MINIX_BLOCK_SIZE, SEEK_SET))
errx(MKFS_ERROR, _("%s: seek failed in write_block"), device_name);
- if (BLOCK_SIZE != write(DEV, buffer, BLOCK_SIZE))
+ if (MINIX_BLOCK_SIZE != write(DEV, buffer, MINIX_BLOCK_SIZE))
errx(MKFS_ERROR, _("%s: write failed in write_block"), device_name);
}
struct minix_inode * inode = &Inode[MINIX_BAD_INO];
int i,j,zone;
int ind=0,dind=0;
- unsigned short ind_block[BLOCK_SIZE>>1];
- unsigned short dind_block[BLOCK_SIZE>>1];
+ unsigned short ind_block[MINIX_BLOCK_SIZE>>1];
+ unsigned short dind_block[MINIX_BLOCK_SIZE>>1];
#define NEXT_BAD (zone = next(zone))
inode->i_nlinks = 1;
inode->i_time = time(NULL);
inode->i_mode = S_IFREG + 0000;
- inode->i_size = badblocks*BLOCK_SIZE;
+ inode->i_size = badblocks*MINIX_BLOCK_SIZE;
zone = next(0);
for (i=0 ; i<7 ; i++) {
inode->i_zone[i] = zone;
goto end_bad;
}
inode->i_zone[7] = ind = get_free_block();
- memset(ind_block,0,BLOCK_SIZE);
+ memset(ind_block,0,MINIX_BLOCK_SIZE);
for (i=0 ; i<512 ; i++) {
ind_block[i] = zone;
if (!NEXT_BAD)
goto end_bad;
}
inode->i_zone[8] = dind = get_free_block();
- memset(dind_block,0,BLOCK_SIZE);
+ memset(dind_block,0,MINIX_BLOCK_SIZE);
for (i=0 ; i<512 ; i++) {
write_block(ind,(char *) ind_block);
dind_block[i] = ind = get_free_block();
- memset(ind_block,0,BLOCK_SIZE);
+ memset(ind_block,0,MINIX_BLOCK_SIZE);
for (j=0 ; j<512 ; j++) {
ind_block[j] = zone;
if (!NEXT_BAD)
struct minix2_inode *inode = &Inode2[MINIX_BAD_INO];
int i, j, zone;
int ind = 0, dind = 0;
- unsigned long ind_block[BLOCK_SIZE >> 2];
- unsigned long dind_block[BLOCK_SIZE >> 2];
+ unsigned long ind_block[MINIX_BLOCK_SIZE >> 2];
+ unsigned long dind_block[MINIX_BLOCK_SIZE >> 2];
if (!badblocks)
return;
inode->i_nlinks = 1;
inode->i_atime = inode->i_mtime = inode->i_ctime = time (NULL);
inode->i_mode = S_IFREG + 0000;
- inode->i_size = badblocks * BLOCK_SIZE;
+ inode->i_size = badblocks * MINIX_BLOCK_SIZE;
zone = next (0);
for (i = 0; i < 7; i++) {
inode->i_zone[i] = zone;
goto end_bad;
}
inode->i_zone[7] = ind = get_free_block ();
- memset (ind_block, 0, BLOCK_SIZE);
+ memset (ind_block, 0, MINIX_BLOCK_SIZE);
for (i = 0; i < 256; i++) {
ind_block[i] = zone;
if (!NEXT_BAD)
goto end_bad;
}
inode->i_zone[8] = dind = get_free_block ();
- memset (dind_block, 0, BLOCK_SIZE);
+ memset (dind_block, 0, MINIX_BLOCK_SIZE);
for (i = 0; i < 256; i++) {
write_block (ind, (char *) ind_block);
dind_block[i] = ind = get_free_block ();
- memset (ind_block, 0, BLOCK_SIZE);
+ memset (ind_block, 0, MINIX_BLOCK_SIZE);
for (j = 0; j < 256; j++) {
ind_block[j] = zone;
if (!NEXT_BAD)
int i;
unsigned long inodes, zmaps, imaps, zones;
- super_block_buffer = calloc(1, BLOCK_SIZE);
+ super_block_buffer = calloc(1, MINIX_BLOCK_SIZE);
if (!super_block_buffer)
err(MKFS_ERROR, _("%s: unable to alloc buffer for superblock"),
device_name);
imaps = get_nimaps();
zmaps = get_nzmaps();
- inode_map = malloc(imaps * BLOCK_SIZE);
- zone_map = malloc(zmaps * BLOCK_SIZE);
+ inode_map = malloc(imaps * MINIX_BLOCK_SIZE);
+ zone_map = malloc(zmaps * MINIX_BLOCK_SIZE);
if (!inode_map || !zone_map)
err(MKFS_ERROR, _("%s: unable to allocate buffers for maps"),
device_name);
- memset(inode_map,0xff,imaps * BLOCK_SIZE);
- memset(zone_map,0xff,zmaps * BLOCK_SIZE);
+ memset(inode_map,0xff,imaps * MINIX_BLOCK_SIZE);
+ memset(zone_map,0xff,zmaps * MINIX_BLOCK_SIZE);
for (i = get_first_zone() ; i<zones ; i++)
unmark_zone(i);
for (i = MINIX_ROOT_INO ; i<=inodes; i++)
printf(_("%ld inodes\n"), inodes);
printf(_("%ld blocks\n"), zones);
printf(_("Firstdatazone=%ld (%ld)\n"), get_first_zone(), first_zone_data());
- printf(_("Zonesize=%d\n"),BLOCK_SIZE<<get_zone_size());
+ printf(_("Zonesize=%d\n"),MINIX_BLOCK_SIZE<<get_zone_size());
printf(_("Maxsize=%ld\n\n"),get_max_size());
}
long got;
/* Seek to the correct loc. */
- if (lseek(DEV, current_block * BLOCK_SIZE, SEEK_SET) !=
- current_block * BLOCK_SIZE )
+ if (lseek(DEV, current_block * MINIX_BLOCK_SIZE, SEEK_SET) !=
+ current_block * MINIX_BLOCK_SIZE )
err(MKFS_ERROR, _("%s: seek failed during testing of blocks"),
device_name);
/* Try the read */
- got = read(DEV, buffer, try * BLOCK_SIZE);
+ got = read(DEV, buffer, try * MINIX_BLOCK_SIZE);
if (got < 0) got = 0;
- if (got & (BLOCK_SIZE - 1 )) {
+ if (got & (MINIX_BLOCK_SIZE - 1 )) {
printf(_("Weird values in do_check: probably bugs\n"));
}
- got /= BLOCK_SIZE;
+ got /= MINIX_BLOCK_SIZE;
return got;
}
static void check_blocks(void) {
int try,got;
- static char buffer[BLOCK_SIZE * TEST_BUFFER_BLOCKS];
+ static char buffer[MINIX_BLOCK_SIZE * TEST_BUFFER_BLOCKS];
unsigned long zones = get_nzones();
unsigned long first_zone = get_first_zone();
signal(SIGALRM,alarm_intr);
alarm(5);
while (currently_testing < zones) {
- if (lseek(DEV,currently_testing*BLOCK_SIZE,SEEK_SET) !=
- currently_testing*BLOCK_SIZE)
+ if (lseek(DEV,currently_testing*MINIX_BLOCK_SIZE,SEEK_SET) !=
+ currently_testing*MINIX_BLOCK_SIZE)
errx(MKFS_ERROR, _("%s: seek failed in check_blocks"),
device_name);
try = TEST_BUFFER_BLOCKS;
exit(0);
}
- if (INODE_SIZE * MINIX_INODES_PER_BLOCK != BLOCK_SIZE)
+ if (INODE_SIZE * MINIX_INODES_PER_BLOCK != MINIX_BLOCK_SIZE)
errx(MKFS_ERROR, _("%s: bad inode size"), device_name);
- if (INODE2_SIZE * MINIX2_INODES_PER_BLOCK != BLOCK_SIZE)
+ if (INODE2_SIZE * MINIX2_INODES_PER_BLOCK != MINIX_BLOCK_SIZE)
errx(MKFS_ERROR, _("%s: bad inode size"), device_name);
opterr = 0;
if (blkdev_is_misaligned(DEV))
warnx(_("%s: device is misaligned"), device_name);
- if (BLOCK_SIZE < sectorsize)
+ if (MINIX_BLOCK_SIZE < sectorsize)
errx(MKFS_ERROR, _("block size smaller than physical "
"sector size of %s"), device_name);
if (!BLOCKS) {
if (blkdev_get_size(DEV, &BLOCKS) == -1)
errx(MKFS_ERROR, _("cannot determine size of %s"),
device_name);
- BLOCKS /= BLOCK_SIZE;
+ BLOCKS /= MINIX_BLOCK_SIZE;
}
} else if (!S_ISBLK(statbuf.st_mode)) {
if (!BLOCKS)
- BLOCKS = statbuf.st_size / BLOCK_SIZE;
+ BLOCKS = statbuf.st_size / MINIX_BLOCK_SIZE;
check=0;
} else if (statbuf.st_rdev == 0x0300 || statbuf.st_rdev == 0x0340)
errx(MKFS_ERROR, _("will not try to make filesystem on '%s'"), device_name);
uint8_t s_disk_version;
};
-#define BLOCK_SIZE_BITS 10
-#define BLOCK_SIZE (1<<BLOCK_SIZE_BITS)
+#define MINIX_BLOCK_SIZE_BITS 10
+#define MINIX_BLOCK_SIZE (1<<MINIX_BLOCK_SIZE_BITS)
#define NAME_MAX 255 /* # chars in a file name */
#define MAX_INODES 65535
-#define MINIX_INODES_PER_BLOCK ((BLOCK_SIZE)/(sizeof (struct minix_inode)))
-#define MINIX2_INODES_PER_BLOCK ((BLOCK_SIZE)/(sizeof (struct minix2_inode)))
+#define MINIX_INODES_PER_BLOCK ((MINIX_BLOCK_SIZE)/(sizeof (struct minix_inode)))
+#define MINIX2_INODES_PER_BLOCK ((MINIX_BLOCK_SIZE)/(sizeof (struct minix2_inode)))
#define MINIX_VALID_FS 0x0001 /* Clean fs. */
#define MINIX_ERROR_FS 0x0002 /* fs has errors. */
static char *inode_map;
static char *zone_map;
-#define BITS_PER_BLOCK (BLOCK_SIZE<<3)
+#define BITS_PER_BLOCK (MINIX_BLOCK_SIZE<<3)
#define UPPER(size,n) ((size+((n)-1))/(n))
static inline unsigned long get_inode_buffer_size(void)
{
- return inode_blocks() * BLOCK_SIZE;
+ return inode_blocks() * MINIX_BLOCK_SIZE;
}
#endif /* UTIL_LINUX_MINIX_H */
#include "superblocks.h"
#include "minix.h"
-#define MINIX_BLOCK_SIZE_BITS 10
-#define MINIX_BLOCK_SIZE (1 << MINIX_BLOCK_SIZE_BITS)
-
static int probe_minix(blkid_probe pr, const struct blkid_idmag *mag)
{
unsigned char *ext;
projects / thirdparty / util-linux.git / commitdiff
