deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

corrected file cache status checks in previous commit.

Browse source
This commit is contained in:
nvt-se 2009-02-17 18:50:29 +00:00
parent d029dd8240
commit 07c50cc200
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
core/cfs/cfs-coffee.c
View file

@ -286,7 +286,7 @@ load_file(const char *name, struct file_header *hdr, coffee_page_t start)
struct file *file; struct file *file;
/* /*
* We prefer to overwrite a free slot since unreferences ones * We prefer to overwrite a free slot since unreferenced ones
* contain usable data. Free slots are designated by the page * contain usable data. Free slots are designated by the page
* value INVALID_PAGE. * value INVALID_PAGE.
*/ */
@ -325,7 +325,7 @@ find_file(const char *name)
/* First check if the file metadata is cached. */ /* First check if the file metadata is cached. */
for(i = 0; i < COFFEE_MAX_OPEN_FILES; i++) { for(i = 0; i < COFFEE_MAX_OPEN_FILES; i++) {
if(coffee_files[i].page == INVALID_PAGE) { if(coffee_files[i].max_pages == 0) {
continue; continue;
} }
@ -506,6 +506,7 @@ remove_by_page(coffee_page_t page, int remove_log, int close_fds)
if(last_valid >= 0) { if(last_valid >= 0) {
coffee_fd_set[last_valid].file->page = INVALID_PAGE; coffee_fd_set[last_valid].file->page = INVALID_PAGE;
coffee_fd_set[last_valid].file->references = 0;
} }
} }
@ -1014,7 +1015,6 @@ cfs_read(int fd, void *buf, unsigned size)
fdp = &coffee_fd_set[fd]; fdp = &coffee_fd_set[fd];
file = fdp->file; file = fdp->file;
if(fdp->offset + size > file->end) { if(fdp->offset + size > file->end) {
size = file->end - fdp->offset; size = file->end - fdp->offset;
} }