X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Ffs%2Fbattfs.c;h=dbed578183670bd28721c9d75548dca536d968e0;hb=706954ecdc8313eb3dd0a23190ae9d12cd4392a3;hp=119085907637112386c7ef5094722166e981e127;hpb=133c08ba914cdfe533693a1633fe4377b6e255f9;p=bertos.git

diff --git a/bertos/fs/battfs.c b/bertos/fs/battfs.c
index 11908590..dbed5781 100644
--- a/bertos/fs/battfs.c
+++ b/bertos/fs/battfs.c
@@ -32,20 +32,21 @@
  *
  * \brief BattFS: a filesystem for embedded platforms (implementation).
  *
- * \version $Id:$
+ * \version $Id$
  *
  * \author Francesco Sacchi <batt@develer.com>
  *
  */
 
 #include "battfs.h"
-
+#include "cfg/cfg_battfs.h"
 #include <cfg/debug.h>
 #include <cfg/macros.h> /* MIN, MAX */
+#include <cfg/test.h>
 #include <cpu/byteorder.h> /* cpu_to_xx */
 
-#define LOG_LEVEL       LOG_LVL_INFO
-#define LOG_FORMAT      LOG_FMT_VERBOSE
+#define LOG_LEVEL       BATTFS_LOG_LEVEL
+#define LOG_FORMAT      BATTFS_LOG_FORMAT
 #include <cfg/log.h>
 
 #include <string.h> /* memset, memmove */
@@ -127,22 +128,6 @@ static fcs_t computeFcs(struct BattFsPageHeader *hdr)
 	return cks;
 }
 
-/**
- * Read from disk.
- * If available, the cache will be used.
- * \return the number of bytes read.
- */
-static size_t diskRead(struct BattFsSuper *disk, pgcnt_t page, pgaddr_t addr, void *buf, size_t size)
-{
-	/* Try to read from cache */
-	if (page == disk->curr_page)
-		return disk->bufferRead(disk, addr, buf, size);
-	/* Read from disk */
-	else
-		return disk->read(disk, page, addr, buf, size);
-}
-
-
 /**
  * Read header of \a page in \a hdr.
  * \return true on success, false otherwise.
@@ -150,12 +135,13 @@ static size_t diskRead(struct BattFsSuper *disk, pgcnt_t page, pgaddr_t addr, vo
 static bool readHdr(struct BattFsSuper *disk, pgcnt_t page, struct BattFsPageHeader *hdr)
 {
 	uint8_t buf[BATTFS_HEADER_LEN];
+
 	/*
 	 * Read header from disk.
 	 * Header is actually a footer, and so
 	 * resides at page end.
 	 */
-	if (diskRead(disk, page, disk->page_size - BATTFS_HEADER_LEN, buf, BATTFS_HEADER_LEN)
+	if (kblock_read(disk->dev, page, buf, disk->data_size, BATTFS_HEADER_LEN)
 	    != BATTFS_HEADER_LEN)
 	{
 		LOG_ERR("page[%d]\n", page);
@@ -168,11 +154,7 @@ static bool readHdr(struct BattFsSuper *disk, pgcnt_t page, struct BattFsPageHea
 	return true;
 }
 
-/**
- * Set header on current \a disk page buffer.
- * \return true on success, false otherwise.
- */
-static bool setBufferHdr(struct BattFsSuper *disk, struct BattFsPageHeader *hdr)
+static bool writeHdr(struct BattFsSuper *disk, pgcnt_t page, struct BattFsPageHeader *hdr)
 {
 	uint8_t buf[BATTFS_HEADER_LEN];
 
@@ -182,11 +164,11 @@ static bool setBufferHdr(struct BattFsSuper *disk, struct BattFsPageHeader *hdr)
 	battfs_to_disk(hdr, buf);
 
 	/*
-	 * write header to buffer.
+	 * write header to disk.
 	 * Header is actually a footer, and so
 	 * resides at page end.
 	 */
-	if (disk->bufferWrite(disk, disk->page_size - BATTFS_HEADER_LEN, buf, BATTFS_HEADER_LEN)
+	if (kblock_write(disk->dev, page, buf, disk->data_size, BATTFS_HEADER_LEN)
 	    != BATTFS_HEADER_LEN)
 	{
 		LOG_ERR("writing to buffer\n");
@@ -195,21 +177,6 @@ static bool setBufferHdr(struct BattFsSuper *disk, struct BattFsPageHeader *hdr)
 	return true;
 }
 
-static bool getBufferHdr(struct BattFsSuper *disk, struct BattFsPageHeader *hdr)
-{
-	uint8_t buf[BATTFS_HEADER_LEN];
-
-	if (disk->bufferRead(disk, disk->page_size - BATTFS_HEADER_LEN, buf, BATTFS_HEADER_LEN)
-	    != BATTFS_HEADER_LEN)
-	{
-		LOG_ERR("reading from buffer\n");
-		return false;
-	}
-
-	disk_to_battfs(buf, hdr);
-
-	return true;
-}
 
 /**
  * Count the number of pages from
@@ -232,7 +199,7 @@ static pgcnt_t countPages(pgoff_t *filelen_table, inode_t inode)
 static void movePages(struct BattFsSuper *disk, pgcnt_t src, int offset)
 {
 	pgcnt_t dst = src + offset;
-	LOG_INFO("src %d, offset %d, size %ld\n", src, offset, (disk->page_count - MAX(dst, src)) * sizeof(pgcnt_t));
+	LOG_INFO("src %d, offset %d, size %d\n", src, offset, (unsigned int)((disk->page_count - MAX(dst, src)) * sizeof(pgcnt_t)));
 	memmove(&disk->page_array[dst], &disk->page_array[src], (disk->page_count - MAX(dst, src)) * sizeof(pgcnt_t));
 
 	if (offset < 0)
@@ -264,12 +231,12 @@ static bool countDiskFilePages(struct BattFsSuper *disk, pgoff_t *filelen_table)
 			return false;
 
 		/* Increase free space */
-		disk->free_bytes += disk->page_size - BATTFS_HEADER_LEN;
+		disk->free_bytes += disk->data_size;
 
 		/* Check header FCS */
 		if (hdr.fcs == computeFcs(&hdr))
 		{
-			ASSERT(hdr.fill <= disk->page_size - BATTFS_HEADER_LEN);
+			ASSERT(hdr.fill <= disk->data_size);
 
 			/* Page is valid and is owned by a file */
 			filelen_table[hdr.inode]++;
@@ -279,7 +246,7 @@ static bool countDiskFilePages(struct BattFsSuper *disk, pgoff_t *filelen_table)
 			disk->free_page_start++;
 		}
 	}
-	LOG_INFO("free_bytes:%d, free_page_start:%d\n", disk->free_bytes, disk->free_page_start);
+	LOG_INFO("free_bytes:%ld, free_page_start:%d\n", (long)disk->free_bytes, disk->free_page_start);
 
 	return true;
 }
@@ -382,7 +349,7 @@ static bool fillPageArray(struct BattFsSuper *disk, pgoff_t *filelen_table)
 		{
 			/* Invalid page, keep as free */
 			ASSERT(disk->page_array[curr_free_page] == PAGE_UNSET_SENTINEL);
-			LOG_INFO("Page %d invalid, keeping as free\n", page);
+			//LOG_INFO("Page %d invalid, keeping as free\n", page);
 			disk->page_array[curr_free_page++] = page;
 		}
 	}
@@ -390,90 +357,33 @@ static bool fillPageArray(struct BattFsSuper *disk, pgoff_t *filelen_table)
 }
 
 
-/**
- * Flush the current \a disk buffer.
- * \return true if ok, false on errors.
- */
-static bool flushBuffer(struct BattFsSuper *disk)
-{
-	if (disk->cache_dirty)
-	{
-		LOG_INFO("Flushing to disk page %d\n", disk->curr_page);
-
-		if (!(disk->erase(disk, disk->curr_page)
-			&& disk->save(disk, disk->curr_page)))
-			return false;
-
-		disk->cache_dirty = false;
-	}
-	return true;
-}
-
-/**
- * Load \a new_page from \a disk in disk page buffer.
- * If a previuos page is still dirty in the buffer, will be
- * flushed first. The new page header loaded will be put in \a new_hdr.
- * \return true if ok, false on errors.
- */
-static bool loadPage(struct BattFsSuper *disk, pgcnt_t new_page, BattFsPageHeader *new_hdr)
-{
-	if (disk->curr_page == new_page)
-		return true;
-
-	LOG_INFO("Loading page %d\n", new_page);
-
-	if (!(flushBuffer(disk)
-		&& disk->load(disk, new_page)
-		&& getBufferHdr(disk, new_hdr)))
-		return false;
-
-	disk->curr_page = new_page;
-
-	return true;
-}
-
-
 /**
  * Initialize and mount disk described by
  * \a disk.
  * \return false on errors, true otherwise.
  */
-bool battfs_init(struct BattFsSuper *disk)
+bool battfs_mount(struct BattFsSuper *disk, struct KBlock *dev, pgcnt_t *page_array, size_t array_size)
 {
 	pgoff_t filelen_table[BATTFS_MAX_FILES];
 
-	/* Sanity check */
-	ASSERT(disk->open);
+	ASSERT(dev);
+	disk->dev = dev;
+	disk->page_size = dev->blk_size;
+	disk->page_count = dev->blk_cnt;
 
-	/* Init disk device */
-	if (!disk->open(disk))
-	{
-		LOG_ERR("open error\n");
-		return false;
-	}
-
-	/* Disk open must set all of these */
-	ASSERT(disk->read);
-	ASSERT(disk->load);
-	ASSERT(disk->bufferWrite);
-	ASSERT(disk->bufferRead);
-	ASSERT(disk->save);
-	ASSERT(disk->erase);
-	ASSERT(disk->close);
-	ASSERT(disk->page_size);
+	ASSERT(disk->page_size > BATTFS_HEADER_LEN);
+	/* Fill page_size with the usable space */
+	disk->data_size = disk->page_size - BATTFS_HEADER_LEN;
 	ASSERT(disk->page_count);
 	ASSERT(disk->page_count < PAGE_UNSET_SENTINEL - 1);
-	ASSERT(disk->page_array);
+	ASSERT(page_array);
+	disk->page_array = page_array;
+	ASSERT(array_size >= disk->page_count * sizeof(pgcnt_t));
 
 	memset(filelen_table, 0, BATTFS_MAX_FILES * sizeof(pgoff_t));
 
 	disk->free_bytes = 0;
-	disk->disk_size = (disk_size_t)(disk->page_size - BATTFS_HEADER_LEN) * disk->page_count;
-
-	/* Initialize page buffer cache */
-	disk->cache_dirty = false;
-	disk->curr_page = 0;
-	disk->load(disk, disk->curr_page);
+	disk->disk_size = (disk_size_t)disk->data_size * disk->page_count;
 
 	/* Count pages per file */
 	if (!countDiskFilePages(disk, filelen_table))
@@ -494,18 +404,80 @@ bool battfs_init(struct BattFsSuper *disk)
 		LOG_ERR("filling page array\n");
 		return false;
 	}
-	#if LOG_LEVEL > LOG_LVL_INFO
-		dumpPageArray(disk)
+	#if LOG_LEVEL >= LOG_LVL_INFO
+		dumpPageArray(disk);
+	#endif
+	#if CONFIG_BATTFS_SHUFFLE_FREE_PAGES
+		SHUFFLE(&disk->page_array[disk->free_page_start], disk->page_count - disk->free_page_start);
+
+		LOG_INFO("Page array after shuffle:\n");
+		#if LOG_LEVEL >= LOG_LVL_INFO
+			dumpPageArray(disk);
+		#endif
 	#endif
-	#warning TODO: shuffle free blocks
-	//#if LOG_LEVEL > LOG_LVL_INFO
-	//	dumpPageArray(disk)
-	//#endif
 	/* Init list for opened files. */
 	LIST_INIT(&disk->file_opened_list);
 	return true;
 }
 
+/**
+ * Check the filesystem.
+ * \return true if ok, false on errors.
+ */
+bool battfs_fsck(struct BattFsSuper *disk)
+{
+	#define FSCHECK(cond) do { if(!(cond)) { LOG_ERR("\"" #cond "\"\n"); return false; } } while (0)
+
+	FSCHECK(disk->free_page_start <= disk->page_count);
+	FSCHECK(disk->data_size < disk->page_size);
+	FSCHECK(disk->free_bytes <= disk->disk_size);
+
+	disk_size_t free_bytes = 0;
+	BattFsPageHeader hdr, prev_hdr;
+	inode_t files = 0;
+	pgcnt_t page_used = 0;
+
+	bool start = true;
+
+	/* Uneeded, the first time will be overwritten but useful to silence
+	 * the warning for uninitialized value */
+	FSCHECK(readHdr(disk, 0, &prev_hdr));
+	for (pgcnt_t page = 0; page < disk->page_count; page++)
+	{
+		FSCHECK(readHdr(disk, disk->page_array[page], &hdr));
+		free_bytes += disk->data_size;
+
+		if (page < disk->free_page_start)
+		{
+			FSCHECK(computeFcs(&hdr) == hdr.fcs);
+			page_used++;
+			free_bytes -= hdr.fill;
+			if (hdr.inode != prev_hdr.inode || start)
+			{
+				if (LIKELY(!start))
+					FSCHECK(hdr.inode > prev_hdr.inode);
+				else
+					start = false;
+
+				FSCHECK(hdr.pgoff == 0);
+				files++;
+			}
+			else
+			{
+				FSCHECK(hdr.fill != 0);
+				FSCHECK(prev_hdr.fill == disk->data_size);
+				FSCHECK(hdr.pgoff == prev_hdr.pgoff + 1);
+			}
+			prev_hdr = hdr;
+		}
+	}
+
+	FSCHECK(page_used == disk->free_page_start);
+	FSCHECK(free_bytes == disk->free_bytes);
+
+	return true;
+}
+
 /**
  * Flush file \a fd.
  * \return 0 if ok, EOF on errors.
@@ -514,10 +486,13 @@ static int battfs_flush(struct KFile *fd)
 {
 	BattFs *fdb = BATTFS_CAST(fd);
 
-	if (flushBuffer(fdb->disk))
+	if (kblock_flush(fdb->disk->dev) == 0)
 		return 0;
 	else
+	{
+		fdb->errors |= BATTFS_DISK_FLUSHBUF_ERR;
 		return EOF;
+	}
 }
 
 /**
@@ -528,23 +503,27 @@ static int battfs_fileclose(struct KFile *fd)
 {
 	BattFs *fdb = BATTFS_CAST(fd);
 
-	battfs_flush(fd);
-	REMOVE(&fdb->link);
-	return 0;
+	if (battfs_flush(fd) == 0)
+	{
+		REMOVE(&fdb->link);
+		return 0;
+	}
+	else
+		return EOF;
 }
 
+#define NO_SPACE PAGE_UNSET_SENTINEL
 
-static bool getNewPage(struct BattFsSuper *disk, pgcnt_t new_pos, inode_t inode, pgoff_t pgoff, BattFsPageHeader *new_hdr)
+static pgcnt_t allocateNewPage(struct BattFsSuper *disk, pgcnt_t new_pos, inode_t inode)
 {
-	if (disk->free_page_start >= disk->page_count)
+	if (SPACE_OVER(disk))
 	{
-		#warning TODO space over!
-		LOG_INFO("No disk space available\n");
-		return false;
+		LOG_ERR("No disk space available!\n");
+		return NO_SPACE;
 	}
-	flushBuffer(disk);
+
 	LOG_INFO("Getting new page %d, pos %d\n", disk->page_array[disk->free_page_start], new_pos);
-	disk->curr_page = disk->page_array[disk->free_page_start++];
+	pgcnt_t new_page = disk->page_array[disk->free_page_start++];
 	memmove(&disk->page_array[new_pos + 1], &disk->page_array[new_pos], (disk->free_page_start - new_pos - 1) * sizeof(pgcnt_t));
 
 	Node *n;
@@ -559,14 +538,26 @@ static bool getNewPage(struct BattFsSuper *disk, pgcnt_t new_pos, inode_t inode,
 		}
 	}
 
-	disk->page_array[new_pos] = disk->curr_page;
-	disk->cache_dirty = true;
+	disk->page_array[new_pos] = new_page;
+	return new_page;
+}
+
+static pgcnt_t renewPage(struct BattFsSuper *disk, pgcnt_t old_pos)
+{
+	if (SPACE_OVER(disk))
+	{
+		LOG_ERR("No disk space available!\n");
+		return PAGE_UNSET_SENTINEL;
+	}
+
+	/* Get a free page */
+	pgcnt_t new_page = disk->page_array[disk->free_page_start];
+	movePages(disk, disk->free_page_start + 1, -1);
 
-	new_hdr->inode = inode;
-	new_hdr->pgoff =  pgoff;
-	new_hdr->fill = 0;
-	new_hdr->seq = 0;
-	return setBufferHdr(disk, new_hdr);
+	/* Insert previous page in free blocks list */
+	LOG_INFO("Setting page %d as free\n", old_pos);
+	disk->page_array[disk->page_count - 1] = old_pos;
+	return new_page;
 }
 
 /**
@@ -576,76 +567,178 @@ static bool getNewPage(struct BattFsSuper *disk, pgcnt_t new_pos, inode_t inode,
 static size_t battfs_write(struct KFile *fd, const void *_buf, size_t size)
 {
 	BattFs *fdb = BATTFS_CAST(fd);
+	BattFsSuper *disk = fdb->disk;
 	const uint8_t *buf = (const uint8_t *)_buf;
 
 	size_t total_write = 0;
 	pgoff_t pg_offset;
 	pgaddr_t addr_offset;
 	pgaddr_t wr_len;
-
 	BattFsPageHeader curr_hdr;
-	if (!getBufferHdr(fdb->disk, &curr_hdr))
+	pgcnt_t new_page;
+
+	if (fd->seek_pos < 0)
+	{
+		fdb->errors |= BATTFS_NEGATIVE_SEEK_ERR;
 		return total_write;
+	}
 
-	#warning TODO seek_pos > size?
+	if (fd->seek_pos > fd->size)
+	{
+		if (!readHdr(disk, fdb->start[fdb->max_off], &curr_hdr))
+		{
+			fdb->errors |= BATTFS_DISK_READ_ERR;
+			return total_write;
+		}
+
+		new_page = renewPage(disk, fdb->start[fdb->max_off]);
+		if (new_page == NO_SPACE)
+		{
+			fdb->errors |= BATTFS_DISK_SPACEOVER_ERR;
+			return total_write;
+		}
+
+		kblock_copy(disk->dev, fdb->start[fdb->max_off], new_page);
+		fdb->start[fdb->max_off] = new_page;
+
+		/* Fill unused space of first page with 0s */
+		uint8_t dummy = 0;
+		pgaddr_t zero_bytes = MIN(fd->seek_pos - fd->size, (kfile_off_t)(disk->data_size - curr_hdr.fill));
+		while (zero_bytes--)
+		{
+			if (kblock_write(disk->dev, new_page, &dummy, curr_hdr.fill, 1) != 1)
+			{
+				fdb->errors |= BATTFS_DISK_WRITE_ERR;
+				return total_write;
+			}
+			curr_hdr.fill++;
+			fd->size++;
+			disk->free_bytes--;
+		}
+		curr_hdr.seq++;
+		if (!writeHdr(disk, new_page, &curr_hdr))
+		{
+			fdb->errors |= BATTFS_DISK_WRITE_ERR;
+			return total_write;
+		}
+
+		/* Allocate the missing pages first. */
+		pgoff_t missing_pages = fd->seek_pos / disk->data_size - fdb->max_off;
+
+		if (missing_pages)
+		{
+			LOG_INFO("missing pages: %d\n", missing_pages);
+
+			while (missing_pages--)
+			{
+				zero_bytes = MIN((kfile_off_t)disk->data_size, fd->seek_pos - fd->size);
+
+				new_page = allocateNewPage(disk, (fdb->start - disk->page_array) + fdb->max_off + 1, fdb->inode);
+				if (new_page == NO_SPACE)
+				{
+					fdb->errors |= BATTFS_DISK_SPACEOVER_ERR;
+					return total_write;
+				}
+
+
+				/* Fill page buffer with 0 to avoid filling unused pages with garbage */
+				for (pgaddr_t off = 0; off < disk->data_size; off++)
+				{
+					if (kblock_write(disk->dev, new_page, &dummy, off, 1) != 1)
+					{
+						fdb->errors |= BATTFS_DISK_WRITE_ERR;
+						return total_write;
+					}
+				}
+				curr_hdr.inode = fdb->inode;
+				curr_hdr.pgoff = ++fdb->max_off;
+				curr_hdr.fill = zero_bytes;
+				curr_hdr.seq = 0;
+
+				if (!writeHdr(disk, new_page, &curr_hdr))
+				{
+					fdb->errors |= BATTFS_DISK_WRITE_ERR;
+					return total_write;
+				}
+
+				/* Update size and free space left */
+				fd->size += zero_bytes;
+				disk->free_bytes -= zero_bytes;
+			}
+		}
+	}
 
 	while (size)
 	{
-		pg_offset = fd->seek_pos / (fdb->disk->page_size - BATTFS_HEADER_LEN);
-		addr_offset = fd->seek_pos % (fdb->disk->page_size - BATTFS_HEADER_LEN);
-		wr_len = MIN(size, (size_t)(fdb->disk->page_size - BATTFS_HEADER_LEN - addr_offset));
+		pg_offset = fd->seek_pos / disk->data_size;
+		addr_offset = fd->seek_pos % disk->data_size;
+		wr_len = MIN(size, (size_t)(disk->data_size - addr_offset));
 
 		/* Handle write outside EOF */
 		if (pg_offset > fdb->max_off)
 		{
-			LOG_INFO("New page needed, pg_offset %d, pos %d\n", pg_offset, (fdb->start - fdb->disk->page_array) + pg_offset);
-			if (!getNewPage(fdb->disk, (fdb->start - fdb->disk->page_array) + pg_offset, fdb->inode, pg_offset, &curr_hdr))
+			LOG_INFO("New page needed, pg_offset %d, pos %d\n", pg_offset, (int)((fdb->start - disk->page_array) + pg_offset));
+
+			new_page = allocateNewPage(disk, (fdb->start - disk->page_array) + pg_offset, fdb->inode);
+			if (new_page == NO_SPACE)
+			{
+				fdb->errors |= BATTFS_DISK_SPACEOVER_ERR;
 				return total_write;
+			}
+
+			curr_hdr.inode = fdb->inode;
+			curr_hdr.pgoff = pg_offset;
+			curr_hdr.fill = 0;
+			curr_hdr.seq = 0;
 			fdb->max_off = pg_offset;
 		}
-		/* Handle cache load of a new page*/
-		else if (fdb->start[pg_offset] != fdb->disk->curr_page)
+		else
 		{
-			LOG_INFO("Re-writing page %d to %d\n", fdb->start[pg_offset], fdb->disk->page_array[fdb->disk->free_page_start]);
-			if (!loadPage(fdb->disk, fdb->start[pg_offset], &curr_hdr))
+			if (!readHdr(disk, fdb->start[pg_offset], &curr_hdr))
 			{
-				#warning TODO set error?
+				fdb->errors |= BATTFS_DISK_READ_ERR;
 				return total_write;
 			}
 
-			/* Get a free page */
-			fdb->disk->curr_page = fdb->disk->page_array[fdb->disk->free_page_start];
-			movePages(fdb->disk, fdb->disk->free_page_start + 1, -1);
+			new_page = renewPage(disk, fdb->start[pg_offset]);
+			if (new_page == NO_SPACE)
+			{
+				fdb->errors |= BATTFS_DISK_SPACEOVER_ERR;
+				return total_write;
+			}
 
-			/* Insert previous page in free blocks list */
-			LOG_INFO("Setting page %d as free\n", fdb->start[pg_offset]);
-			fdb->disk->page_array[fdb->disk->page_count - 1] = fdb->start[pg_offset];
-			/* Assign new page */
-			fdb->start[pg_offset] = fdb->disk->curr_page;
+			LOG_INFO("Re-writing page %d to %d\n", fdb->start[pg_offset], new_page);
+			if (kblock_copy(disk->dev, fdb->start[pg_offset], new_page) != 0)
+			{
+				fdb->errors |= BATTFS_DISK_WRITE_ERR;
+				return total_write;
+			}
+			fdb->start[pg_offset] = new_page;
 			curr_hdr.seq++;
 		}
-
-
-		//LOG_INFO("writing to buffer for page %d, offset %d, size %d\n", fdb->disk->curr_page, addr_offset, wr_len);
-		if (fdb->disk->bufferWrite(fdb->disk, addr_offset, buf, wr_len) != wr_len)
+		//LOG_INFO("writing to buffer for page %d, offset %d, size %d\n", disk->curr_page, addr_offset, wr_len);
+		if (kblock_write(disk->dev, new_page, buf, addr_offset, wr_len) != wr_len)
 		{
-			#warning TODO set error?
+			fdb->errors |= BATTFS_DISK_WRITE_ERR;
+			return total_write;
 		}
-		fdb->disk->cache_dirty = true;
 
 		size -= wr_len;
 		fd->seek_pos += wr_len;
 		total_write += wr_len;
 		buf += wr_len;
 		fill_t fill_delta = MAX((int32_t)(addr_offset + wr_len) - curr_hdr.fill, (int32_t)0);
-		fdb->disk->free_bytes -= fill_delta;
+		disk->free_bytes -= fill_delta;
 		fd->size += fill_delta;
 		curr_hdr.fill += fill_delta;
 
-		if (!setBufferHdr(fdb->disk, &curr_hdr))
+		if (!writeHdr(disk, new_page, &curr_hdr))
+		{
+			fdb->errors |= BATTFS_DISK_WRITE_ERR;
 			return total_write;
+		}
 
-		//LOG_INFO("free_bytes %d, seek_pos %d, size %d, curr_hdr.fill %d\n", fdb->disk->free_bytes, fd->seek_pos, fd->size, curr_hdr.fill);
+		//LOG_INFO("free_bytes %d, seek_pos %d, size %d, curr_hdr.fill %d\n", disk->free_bytes, fd->seek_pos, fd->size, curr_hdr.fill);
 	}
 	return total_write;
 }
@@ -658,6 +751,7 @@ static size_t battfs_write(struct KFile *fd, const void *_buf, size_t size)
 static size_t battfs_read(struct KFile *fd, void *_buf, size_t size)
 {
 	BattFs *fdb = BATTFS_CAST(fd);
+	BattFsSuper *disk = fdb->disk;
 	uint8_t *buf = (uint8_t *)_buf;
 
 	size_t total_read = 0;
@@ -665,23 +759,31 @@ static size_t battfs_read(struct KFile *fd, void *_buf, size_t size)
 	pgaddr_t addr_offset;
 	pgaddr_t read_len;
 
-	size = MIN((kfile_off_t)size, MAX(fd->size - fd->seek_pos, 0));
+	if (fd->seek_pos < 0)
+	{
+		fdb->errors |= BATTFS_NEGATIVE_SEEK_ERR;
+		return total_read;
+	}
+
+	size = MIN((kfile_off_t)size, MAX(fd->size - fd->seek_pos, (kfile_off_t)0));
 
 	while (size)
 	{
-		pg_offset = fd->seek_pos / (fdb->disk->page_size - BATTFS_HEADER_LEN);
-		addr_offset = fd->seek_pos % (fdb->disk->page_size - BATTFS_HEADER_LEN);
-		read_len = MIN(size, (size_t)(fdb->disk->page_size - BATTFS_HEADER_LEN - addr_offset));
+		pg_offset = fd->seek_pos / disk->data_size;
+		addr_offset = fd->seek_pos % disk->data_size;
+		read_len = MIN(size, (size_t)(disk->data_size - addr_offset));
 
+		//LOG_INFO("reading from page %d, offset %d, size %d\n", fdb->start[pg_offset], addr_offset, read_len);
 		/* Read from disk */
-		if (diskRead(fdb->disk, fdb->start[pg_offset], addr_offset, buf, read_len) != read_len)
+		if (kblock_read(disk->dev, fdb->start[pg_offset], buf, addr_offset, read_len) != read_len)
 		{
-			#warning TODO set error?
+			fdb->errors |= BATTFS_DISK_READ_ERR;
+			return total_read;
 		}
 
-		#if _DEBUG
+		#ifdef _DEBUG
 			BattFsPageHeader hdr;
-			readHdr(fdb->disk, fdb->start[pg_offset], &hdr);
+			readHdr(disk, fdb->start[pg_offset], &hdr);
 			ASSERT(hdr.inode == fdb->inode);
 		#endif
 
@@ -726,7 +828,7 @@ static bool findFile(BattFsSuper *disk, inode_t inode, pgcnt_t *last)
 		else if (hdr.fcs == fcs && hdr.inode < inode)
 			first = page + 1;
 		else
-			*last = page - 1;
+			*last = page;
 	}
 	LOG_INFO("Not found: last %d\n", *last);
 	return false;
@@ -763,6 +865,19 @@ static file_size_t countFileSize(BattFsSuper *disk, pgcnt_t *start, inode_t inod
 	return size;
 }
 
+static int battfs_error(struct KFile *fd)
+{
+	BattFs *fdb = BATTFS_CAST(fd);
+	return fdb->errors;
+}
+
+
+static void battfs_clearerr(struct KFile *fd)
+{
+	BattFs *fdb = BATTFS_CAST(fd);
+	fdb->errors = 0;
+}
+
 /**
  * Open file \a inode from \a disk in \a mode.
  * File context is stored in \a fd.
@@ -780,19 +895,39 @@ bool battfs_fileopen(BattFsSuper *disk, BattFs *fd, inode_t inode, filemode_t mo
 	{
 		LOG_INFO("file %d not found\n", inode);
 		if (!(mode & BATTFS_CREATE))
+		{
+			fd->errors |= BATTFS_FILE_NOT_FOUND_ERR;
 			return false;
+		}
 		/* Create the file */
 		BattFsPageHeader hdr;
-		if (!(getNewPage(disk, start_pos, inode, 0, &hdr)))
+
+		if (allocateNewPage(disk, start_pos, inode) == NO_SPACE)
+		{
+			fd->errors |= BATTFS_DISK_SPACEOVER_ERR;
+			return false;
+		}
+
+		hdr.inode = inode;
+		hdr.pgoff = 0;
+		hdr.fill = 0;
+		hdr.seq = 0;
+		if (!writeHdr(disk, disk->page_array[start_pos], &hdr))
+		{
+			fd->errors |= BATTFS_DISK_WRITE_ERR;
 			return false;
+		}
 	}
 	fd->start = &disk->page_array[start_pos];
 	LOG_INFO("Start pos %d\n", start_pos);
 
 	/* Fill file size */
 	if ((fd->fd.size = countFileSize(disk, fd->start, inode)) == EOF)
+	{
+		fd->errors |= BATTFS_DISK_READ_ERR;
 		return false;
-	fd->max_off = fd->fd.size / (disk->page_size - BATTFS_HEADER_LEN);
+	}
+	fd->max_off = fd->fd.size / disk->data_size;
 
 	/* Reset seek position */
 	fd->fd.seek_pos = 0;
@@ -818,21 +953,19 @@ bool battfs_fileopen(BattFsSuper *disk, BattFs *fd, inode_t inode, filemode_t mo
 	fd->fd.seek = kfile_genericSeek;
 	fd->fd.write = battfs_write;
 
-#warning TODO battfs_error, battfs_clearerr
-#if 0
 	fd->fd.error = battfs_error;
 	fd->fd.clearerr = battfs_clearerr;
-#endif
 
 	DB(fd->fd._type = KFT_BATTFS);
 
 	return true;
 }
 
+
 /**
- * Close \a disk.
+ * Umount \a disk.
  */
-bool battfs_close(struct BattFsSuper *disk)
+bool battfs_umount(struct BattFsSuper *disk)
 {
 	Node *n;
 	int res = 0;
@@ -845,32 +978,36 @@ bool battfs_close(struct BattFsSuper *disk)
 	}
 
 	/* Close disk */
-	return disk->close(disk) && (res == 0);
+	return (kblock_flush(disk->dev) == 0) && (kblock_close(disk->dev) == 0) && (res == 0);
 }
 
 #if UNIT_TEST
 
-bool battfs_writeTestBlock(struct BattFsSuper *disk, pgcnt_t page, inode_t inode, seq_t seq, fill_t fill, pgoff_t pgoff)
+void battfs_writeTestBlock(KBlock *dev, pgcnt_t page, inode_t inode, seq_t seq, fill_t fill, pgoff_t pgoff)
 {
-	BattFsPageHeader hdr;
-
-	/* Reset page to all 0xff */
-	uint8_t buf[disk->page_size];
-	memset(buf, 0xFF, disk->page_size);
-	disk->bufferWrite(disk, 0, buf, disk->page_size);
+	uint8_t buf[BATTFS_HEADER_LEN];
+	battfs_eraseBlock(dev, page);
 
+	BattFsPageHeader hdr;
 	hdr.inode = inode;
 	hdr.fill = fill;
 	hdr.pgoff = pgoff;
 	hdr.seq = seq;
 	hdr.fcs = computeFcs(&hdr);
 
-	if (!(setBufferHdr(disk, &hdr) && disk->save(disk, page)))
-	{
-		LOG_ERR("error writing hdr\n");
-		return false;
-	}
+	battfs_to_disk(&hdr, buf);
 
-	return true;
+	ASSERT(kblock_write(dev, page, buf, dev->blk_size - BATTFS_HEADER_LEN, BATTFS_HEADER_LEN) == BATTFS_HEADER_LEN);
+	ASSERT(kblock_flush(dev) == 0);
+}
+
+void battfs_eraseBlock(KBlock *dev, pgcnt_t page)
+{
+	/* Reset page to all 0xff */
+	uint8_t buf[dev->blk_size];
+	memset(buf, 0xFF, dev->blk_size);
+	ASSERT(kblock_write(dev, page, buf, 0, dev->blk_size) == dev->blk_size);
+	ASSERT(kblock_flush(dev) == 0);
 }
+
 #endif