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

mkfs: support indirect blocks in directories

Browse source
This commit is contained in:
Ben Gras 2012-11-07 18:59:03 +01:00
parent 6463554619
commit 77b6e2dcaa
1 changed files with 23 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -421,7 +421,8 @@ void sizeup_dir()
dir_zones = (dir_entries / (NR_DIR_ENTRIES(block_size))); dir_zones = (dir_entries / (NR_DIR_ENTRIES(block_size)));
if(dir_entries % (NR_DIR_ENTRIES(block_size))) if(dir_entries % (NR_DIR_ENTRIES(block_size)))
dir_zones++; dir_zones++;
/* Assumes directory fits in direct blocks */ if(dir_zones > nr_dzones)
dir_zones++; /* Max single indir */
zonecount += dir_zones; zonecount += dir_zones;
return; return;
} }
@ -796,6 +797,7 @@ char *name;
unsigned int k; unsigned int k;
block_t b; block_t b;
zone_t z; zone_t z;
zone_t *indirblock = alloc_block();
d2_inode *ino; d2_inode *ino;
d2_inode *inoblock = get_inoblock(parent, &b, &ino); d2_inode *inoblock = get_inoblock(parent, &b, &ino);
@ -811,6 +813,26 @@ char *name;
if(dir_try_enter(z, child, name)) { if(dir_try_enter(z, child, name)) {
put_block(b, (char *) inoblock); put_block(b, (char *) inoblock);
free(inoblock); free(inoblock);
free(indirblock);
return;
}
}
/* no space in directory using just direct blocks; try indirect */
if (ino->d2_zone[V2_NR_DZONES] == 0)
ino->d2_zone[V2_NR_DZONES] = alloc_zone();
get_block(ino->d2_zone[V2_NR_DZONES], (char *) indirblock);
for(k = 0; k < V2_INDIRECTS(block_size); k++) {
z = indirblock[k];
if(!z) z = indirblock[k] = alloc_zone();
if(dir_try_enter(z, child, name)) {
put_block(b, (char *) inoblock);
put_block(ino->d2_zone[V2_NR_DZONES], (char *) indirblock);
free(inoblock);
free(indirblock);
return; return;
} }
} }