From b5d9da88991592d35d39dcae3829d2498b4e47e4 Mon Sep 17 00:00:00 2001 From: Michal Idziorek Date: Wed, 3 Dec 2014 22:54:35 +0100 Subject: increased logger grnaularity and working on memory management --- fs/ext2.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'fs/ext2.c') diff --git a/fs/ext2.c b/fs/ext2.c index a530ce6..49b6f17 100644 --- a/fs/ext2.c +++ b/fs/ext2.c @@ -118,9 +118,10 @@ int ext2_check(uint8_t *ram) ext2_superblock_ext super_ext; uint8_t *ptr=ram+1024; ram_read(ptr,&super,sizeof(super),1); - if(super.ext2_sig!=0xef53)log(FOOLOS_MODULE_NAME,FOOLOS_LOG_INFO,"no ext2 signature found, where ram-image expected!"); - //check version and req features. - // + + if(super.ext2_sig!=0xef53){ + panic(FOOLOS_MODULE_NAME,"no ext2 signature found, where ram-image expected!"); + } } ext2_inode ext2_get_inode(uint8_t *ram,int inode_num) @@ -133,7 +134,7 @@ ext2_inode ext2_get_inode(uint8_t *ram,int inode_num) uint8_t *ptr=ram+1024; ram_read(ptr,&super,sizeof(super),1); - if(super.ext2_sig!=0xef53)log(FOOLOS_MODULE_NAME,FOOLOS_LOG_INFO,"no ext2 signature found, where ram-image expected!"); + if(super.ext2_sig!=0xef53)panic(FOOLOS_MODULE_NAME,"no ext2 signature found, where ram-image expected!"); int block_group=(inode_num-1)/super.inodes_per_group; @@ -241,7 +242,7 @@ int ext2_inode_content(char *ram,int inode_nr,uint8_t *ramdest,int max) } - log(FOOLOS_MODULE_NAME,FOOLOS_LOG_INFO,"Fool Check Sum: 0x%08X for %d bytes",sum,count); + log(FOOLOS_MODULE_NAME,FOOLOS_LOG_DEBUG,"Fool Check Sum: 0x%08X for %d bytes",sum,count); } @@ -259,7 +260,7 @@ int ext2_filename_to_inode_traverse(uint8_t *ram, char *path,int inode_start) if(*path==0)final=true; else(*path=0); - log(FOOLOS_MODULE_NAME,FOOLOS_LOG_INFO,"looking for %s '%s' in inode: %d",final?"file":"dir",first,inode_start); + log(FOOLOS_MODULE_NAME,FOOLOS_LOG_DEBUG,"looking for %s '%s' in inode: %d",final?"file":"dir",first,inode_start); fs_dirent dirs[15]; int count= ext2_read_dir(ram, inode_start,dirs,15); // get dir @@ -268,7 +269,7 @@ int ext2_filename_to_inode_traverse(uint8_t *ram, char *path,int inode_start) { if(true==strcmp(first,dirs[i].name,0)) { - log(FOOLOS_MODULE_NAME,FOOLOS_LOG_INFO,"found: %s (%s)",first,dirs[i].type==FS_FILE_TYPE_DIR?"dir":"file"); + log(FOOLOS_MODULE_NAME,FOOLOS_LOG_DEBUG,"found: %s (%s)",first,dirs[i].type==FS_FILE_TYPE_DIR?"dir":"file"); if(final)return dirs[i].inode; return ext2_filename_to_inode_traverse(ram,last+1,dirs[i].inode); } @@ -299,7 +300,7 @@ int ext2_filename_to_inode(uint8_t *ram, char *path) int ext2_read_dir(uint8_t *ram, int inode_nr,fs_dirent *dirs,int max) { - log(FOOLOS_MODULE_NAME,FOOLOS_LOG_INFO,"read_dir : max: %d",max); + log(FOOLOS_MODULE_NAME,FOOLOS_LOG_DEBUG,"read_dir : max: %d",max); ext2_inode inode=ext2_get_inode(ram,inode_nr); char buf[256]; -- cgit v1.2.3