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

- important bug fix regarding writing after a merge log operation: parameters

Browse source 
must be restored.

- fixed watchdog problem in reserve
This commit is contained in:
nvt-se 2008-11-19 13:42:07 +00:00
parent c4a5010c46
commit 5fe2c34038
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -492,13 +492,15 @@ reserve(const char *name, uint32_t size, int allow_duplicates)
unsigned need_pages; unsigned need_pages;
int page; int page;
watchdog_stop();
if(!allow_duplicates && find_file(name) >= 0) { if(!allow_duplicates && find_file(name) >= 0) {
watchdog_start();
return -1; return -1;
} }
need_pages = (size + sizeof(hdr) + COFFEE_PAGE_SIZE - 1) / COFFEE_PAGE_SIZE; need_pages = (size + sizeof(hdr) + COFFEE_PAGE_SIZE - 1) / COFFEE_PAGE_SIZE;
watchdog_stop();
page = find_contiguous_pages(need_pages); page = find_contiguous_pages(need_pages);
if(page < 0) { if(page < 0) {
cfs_garbage_collect(); cfs_garbage_collect();
@ -1023,7 +1025,6 @@ cfs_write(int fd, const void *buf, unsigned size)
} }
fdp = &coffee_fd_set[fd]; fdp = &coffee_fd_set[fd];
/* Attempt to extend the file if we try to write past the end. */ /* Attempt to extend the file if we try to write past the end. */
while(size + fdp->offset + sizeof(struct file_header) > while(size + fdp->offset + sizeof(struct file_header) >
fdp->max_pages * COFFEE_PAGE_SIZE) { fdp->max_pages * COFFEE_PAGE_SIZE) {
@ -1042,6 +1043,9 @@ cfs_write(int fd, const void *buf, unsigned size)
i = write_log_page(fdp, &lp); i = write_log_page(fdp, &lp);
if(i == 0) { if(i == 0) {
lp.offset = fdp->offset;
lp.buf = (char *)buf + size - remains;
lp.size = remains;
/* The file was merged with the log. Try again. */ /* The file was merged with the log. Try again. */
i = write_log_page(fdp, &lp); i = write_log_page(fdp, &lp);
} }