sanchayanmaity/minix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

mkfs.mfs:remove some globals

Browse source 
Remove the gobal inocount, zonecount and blockcount.

Change-Id: I77d120bb79bcf183e0c6b5abed736343af7badf2
This commit is contained in:
Kees Jongenburger 2013-04-17 13:41:04 +02:00
parent 0245723d5f
commit 1beca4b7f5
1 changed files with 27 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
usr.sbin/mkfs.mfs/mkfs.c
View file

@ -129,12 +129,14 @@ void dexit(char *s, int sectnum, int err);
__dead void usage(void); __dead void usage(void);
void *alloc_block(void); void *alloc_block(void);
ino_t inocount; struct fs_size {
zone_t zonecount; ino_t inocount; /* amount of inodes */
block_t blockcount; zone_t zonecount; /* amount of zones */
block_t blockcount; /* amount of bloks */
};
void detect_fs_size(void); void detect_fs_size(struct fs_size * fssize);
void sizeup_dir(void); void sizeup_dir(struct fs_size * fssize);
void detect_size(void); void detect_size(void);
void size_dir(void); void size_dir(void);
static int bitmapsize(uint32_t nr_bits, size_t block_size); static int bitmapsize(uint32_t nr_bits, size_t block_size);
@ -154,6 +156,7 @@ char *argv[];
zone_t zones; zone_t zones;
char *token[MAX_TOKENS], line[LINE_LEN]; char *token[MAX_TOKENS], line[LINE_LEN];
struct stat statbuf; struct stat statbuf;
struct fs_size fssize;
/* Get two times, the current time and the mod time of the binary of /* Get two times, the current time and the mod time of the binary of
* mkfs itself. When the -d flag is used, the later time is put into * mkfs itself. When the -d flag is used, the later time is put into
@ -270,9 +273,9 @@ char *argv[];
grpid = atoi(token[2]); grpid = atoi(token[2]);
if(blocks <= 0 && inodes <= 0){ if(blocks <= 0 && inodes <= 0){
detect_fs_size(); detect_fs_size(&fssize);
blocks = blockcount; blocks = fssize.blockcount;
inodes = inocount; inodes = fssize.inocount;
blocks += blocks*extra_space_percent/100; blocks += blocks*extra_space_percent/100;
inodes += inodes*extra_space_percent/100; inodes += inodes*extra_space_percent/100;
printf("dynamically sized filesystem: %d blocks, %d inodes\n", blocks, printf("dynamically sized filesystem: %d blocks, %d inodes\n", blocks,
@ -388,27 +391,28 @@ printf("testb = 0x%x 0x%x 0x%x\n", testb[0], testb[1], testb[block_size-1]);
/*================================================================ /*================================================================
* detect_fs_size - determine image size dynamically * detect_fs_size - determine image size dynamically
*===============================================================*/ *===============================================================*/
void detect_fs_size() void detect_fs_size(struct fs_size * fssize)
{ {
uint32_t point = ftell(proto); uint32_t point = ftell(proto);
inocount = 1; /* root directory node */ fssize->inocount = 1; /* root directory node */
zonecount = 0; fssize->zonecount = 0;
blockcount = 0; fssize->blockcount = 0;
sizeup_dir();
sizeup_dir(fssize);
uint32_t initb; uint32_t initb;
initb = bitmapsize((uint32_t) (1 + inocount), block_size); initb = bitmapsize((uint32_t) (1 + fssize->inocount), block_size);
initb += bitmapsize((uint32_t) zonecount, block_size); initb += bitmapsize((uint32_t) fssize->zonecount, block_size);
initb += START_BLOCK; initb += START_BLOCK;
initb += (inocount + inodes_per_block - 1) / inodes_per_block; initb += (fssize->inocount + inodes_per_block - 1) / inodes_per_block;
blockcount = initb+zonecount; fssize->blockcount = initb+ fssize->zonecount;
fseek(proto, point, SEEK_SET); fseek(proto, point, SEEK_SET);
} }
void sizeup_dir() void sizeup_dir(struct fs_size * fssize)
{ {
char *token[MAX_TOKENS], *p; char *token[MAX_TOKENS], *p;
char line[LINE_LEN]; char line[LINE_LEN];
@ -429,20 +433,20 @@ void sizeup_dir()
dir_zones++; dir_zones++;
if(dir_zones > nr_dzones) if(dir_zones > nr_dzones)
dir_zones++; /* Max single indir */ dir_zones++; /* Max single indir */
zonecount += dir_zones; fssize->zonecount += dir_zones;
return; return;
} }
p = token[1]; p = token[1];
inocount++; fssize->inocount++;
dir_entries++; dir_entries++;
if (*p == 'd') { if (*p == 'd') {
sizeup_dir(); sizeup_dir(fssize);
} else if (*p == 'b' || *p == 'c') { } else if (*p == 'b' || *p == 'c') {
} else if (*p == 's') { } else if (*p == 's') {
zonecount++; /* Symlink contents is always stored a block */ fssize->zonecount++; /* Symlink contents is always stored a block */
} else { } else {
if ((f = fopen(token[4], "r")) == NULL) { if ((f = fopen(token[4], "r")) == NULL) {
fprintf(stderr, "%s: Can't open %s: %s\n", fprintf(stderr, "%s: Can't open %s: %s\n",
@ -461,7 +465,7 @@ void sizeup_dir()
fzones++; fzones++;
if (fzones > nr_dzones) if (fzones > nr_dzones)
fzones++; /* Assumes files fit within single indirect */ fzones++; /* Assumes files fit within single indirect */
zonecount += fzones; fssize->zonecount += fzones;
} }
} }
} }