From c37b9030fdf826a40262dd75ec52e8f8440f8866 Mon Sep 17 00:00:00 2001 From: Bahadir Balban Date: Tue, 13 Oct 2009 13:31:22 +0300 Subject: [PATCH] Fixed a bug with returned fd from sys_open --- conts/posix/mm0/mm/file.c | 1 - conts/posix/mm0/mm/pagers.c | 8 ++++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/conts/posix/mm0/mm/file.c b/conts/posix/mm0/mm/file.c index ecaa2de..952bfe6 100644 --- a/conts/posix/mm0/mm/file.c +++ b/conts/posix/mm0/mm/file.c @@ -1057,7 +1057,6 @@ int sys_open(struct tcb *task, const char *pathname, task->files->fd[fd].vmfile = vmfile; vmfile->openers++; - retval = 0; goto out; } } diff --git a/conts/posix/mm0/mm/pagers.c b/conts/posix/mm0/mm/pagers.c index c934263..8e59d1b 100644 --- a/conts/posix/mm0/mm/pagers.c +++ b/conts/posix/mm0/mm/pagers.c @@ -98,8 +98,8 @@ int file_page_out(struct vm_object *vm_obj, unsigned long page_offset) /* Map the page to self */ l4_map(paddr, vaddr, 1, MAP_USR_RW_FLAGS, self_tid()); - printf("%s/%s: Writing to vnode %lu, at pgoff 0x%lu, %d pages, buf at %p\n", - __TASKNAME__, __FUNCTION__, f->vnode->vnum, page_offset, 1, vaddr); + //printf("%s/%s: Writing to vnode %lu, at pgoff 0x%lu, %d pages, buf at %p\n", + // __TASKNAME__, __FUNCTION__, f->vnode->vnum, page_offset, 1, vaddr); /* Syscall to vfs to write page back to file. */ if ((err = vfs_write(f->vnode, page_offset, 1, vaddr)) < 0) @@ -151,8 +151,8 @@ struct page *file_page_in(struct vm_object *vm_obj, unsigned long page_offset) 1, vaddr)) < 0) goto out_err; - printf("%s/%s: Reading into vnode %lu, at pgoff 0x%lu, %d pages, buf at %p\n", - __TASKNAME__, __FUNCTION__, f->vnode->vnum, page_offset, 1, vaddr); + // printf("%s/%s: Reading into vnode %lu, at pgoff 0x%lu, %d pages, buf at %p\n", + // __TASKNAME__, __FUNCTION__, f->vnode->vnum, page_offset, 1, vaddr); /* Unmap it from vfs */ l4_unmap(vaddr, 1, self_tid());