diff options
Diffstat (limited to 'src/filesys')
| -rw-r--r-- | src/filesys/filesys.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/filesys/filesys.c b/src/filesys/filesys.c index d30f728..ab6ddfe 100644 --- a/src/filesys/filesys.c +++ b/src/filesys/filesys.c @@ -13,6 +13,8 @@ created twice with the same name. */ static struct lock create_lock; +static struct lock lookup_lock; // dir_lookup and dir_remove + /* The disk that contains the file system. */ struct disk *filesys_disk; @@ -28,6 +30,7 @@ filesys_init (bool format) PANIC ("hd0:1 (hdb) not present, file system initialization failed"); lock_init (&create_lock); + lock_init (&lookup_lock); inode_init (); free_map_init (); @@ -79,8 +82,11 @@ filesys_open (const char *name) struct dir *dir = dir_open_root (); struct inode *inode = NULL; - if (dir != NULL) + if (dir != NULL) { + lock_acquire (&lookup_lock); dir_lookup (dir, name, &inode); + lock_release (&lookup_lock); + } dir_close (dir); return file_open (inode); @@ -94,7 +100,9 @@ bool filesys_remove (const char *name) { struct dir *dir = dir_open_root (); + lock_acquire (&lookup_lock); bool success = dir != NULL && dir_remove (dir, name); + lock_release (&lookup_lock); dir_close (dir); return success; |