catfood/lab7-fix2023
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix null ptr in init_vfs_table

Browse Source
This commit is contained in:
catfood 2023-11-22 16:24:23 +08:00
parent 9e43b2bcd3
commit cdd493c0e4
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
kernel/vfs.c
View File

@ -133,6 +133,7 @@ static void init_vfs_table(){ // modified by mingxuan 2020-10-30
// tty0 // tty0
// device_table[0].dev_name="dev_tty0"; // device_table[0].dev_name="dev_tty0";
// device_table[0].op = &f_op_table[0]; // device_table[0].op = &f_op_table[0];
memset(vfs_table, 0, sizeof(vfs_table));
vfs_table[0].fs_name = "dev_tty0"; //modifed by mingxuan 2020-10-18 vfs_table[0].fs_name = "dev_tty0"; //modifed by mingxuan 2020-10-18
vfs_table[0].op = &f_op_table[0]; vfs_table[0].op = &f_op_table[0];
vfs_table[0].sb = &super_block[0]; //每个tty都有一个superblock //added by mingxuan 2020-10-30 vfs_table[0].sb = &super_block[0]; //每个tty都有一个superblock //added by mingxuan 2020-10-30
@ -201,6 +202,7 @@ static int get_index(char path[]){
for(i=0;i<NR_FS;i++) //modified by mingxuan 2020-10-29 for(i=0;i<NR_FS;i++) //modified by mingxuan 2020-10-29
{ {
// if(!strcmp(dev_name, device_table[i].dev_name)) // if(!strcmp(dev_name, device_table[i].dev_name))
if(vfs_table[i].fs_name == NULL) continue;
if(!strcmp(fs_name, vfs_table[i].fs_name)) //modified by mingxuan 2020-10-18 if(!strcmp(fs_name, vfs_table[i].fs_name)) //modified by mingxuan 2020-10-18
return i; return i;
} }