Imperial-MEng/pintos_22
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'userprog-merge' into 'master'

Browse Source 
Update variable references between conflicting merges to refer to the same...

See merge request lab2425_autumn/pintos_22!35
This commit is contained in:
Demetriades, Themis
2024-11-11 22:59:45 +00:00
parent f194fa1fa8 e8713e26c6
commit 9e692ced9e
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/userprog/process.c
View File

@@ -137,7 +137,10 @@ start_process (void *proc_start_data)
goto fail; goto fail;
} }
struct file *exec_file = filesys_open (file_name); /* NOTE: Currently, the file being executed is closed in load () and then
reopened here. Because load is an exported public function, this
might be necessary. */
struct file *exec_file = filesys_open (data->file_name);
thread_current ()->exec_file = exec_file; thread_current ()->exec_file = exec_file;
file_deny_write (exec_file); file_deny_write (exec_file);