mirrors/Astral
1
0
Fork 0
mirror of https://github.com/Mathewnd/Astral.git synced 2026-10-30 14:08:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

vfs: expect fd argument to a few calls

Browse Source
This commit is contained in:
Matheus
2022-10-24 15:40:38 -03:00
parent 72504f3598
commit 763ea89e83
5 changed files with 19 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/sys/sched/elf.c
+5 -5
View File
@@ -58,7 +58,7 @@ static int load(vnode_t* node, elf_ph64 ph){
int err = 0;
size_t readc = vfs_read(&err, node, (void*)ph.memaddr, ph.fsize, ph.offset);
size_t readc = vfs_read(&err, node, (void*)ph.memaddr, ph.fsize, ph.offset, NULL);
if(err)
return err;
@@ -165,7 +165,7 @@ int elf_load(thread_t* thread, vnode_t* node, char** argv, char** env, void** st
elf_ph64 phbuff;
int err = 0;
int readc = vfs_read(&err, node, &header, sizeof(elf_header64), 0);
int readc = vfs_read(&err, node, &header, sizeof(elf_header64), 0, NULL);
if(err)
return err;
@@ -189,7 +189,7 @@ int elf_load(thread_t* thread, vnode_t* node, char** argv, char** env, void** st
for(size_t pos = header.ph_pos, ph = 0; ph < header.ph_count; ++ph, pos += header.ph_size){
readc = vfs_read(&err, node, &phbuff, header.ph_size, pos);
readc = vfs_read(&err, node, &phbuff, header.ph_size, pos, NULL);
if(err)
return err;
@@ -226,7 +226,7 @@ int elf_load(thread_t* thread, vnode_t* node, char** argv, char** env, void** st
if(err)
return err;
readc = vfs_read(&err, interfile, &header, sizeof(elf_header64), 0);
readc = vfs_read(&err, interfile, &header, sizeof(elf_header64), 0, NULL);
if(err)
goto _interpfail;
@@ -238,7 +238,7 @@ int elf_load(thread_t* thread, vnode_t* node, char** argv, char** env, void** st
for(size_t pos = header.ph_pos, ph = 0; ph < header.ph_count; ++ph, pos += header.ph_size){
readc = vfs_read(&err, interfile, &phbuff, header.ph_size, pos);
readc = vfs_read(&err, interfile, &phbuff, header.ph_size, pos, NULL);
if(err)
goto _interpfail;
src/sys/syscalls/read.c
+2 -4
View File
@@ -35,10 +35,8 @@ syscallret syscall_read(int ifd, void* buff, size_t count){
retv.errno = ENOMEM;
return retv;
}
size_t readc = vfs_read(&err, fd->node, kbuff, count, fd->offset);
size_t readc = vfs_read(&err, fd->node, kbuff, count, fd->offset, fd);
if(err){
fd_release(fd);