summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
2851469)
* \a disk.
* \return false on errors, true otherwise.
*/
* \a disk.
* \return false on errors, true otherwise.
*/
-bool battfs_init(struct BattFsSuper *disk)
+bool battfs_mount(struct BattFsSuper *disk)
{
pgoff_t filelen_table[BATTFS_MAX_FILES];
{
pgoff_t filelen_table[BATTFS_MAX_FILES];
-bool battfs_close(struct BattFsSuper *disk)
+bool battfs_umount(struct BattFsSuper *disk)
-bool battfs_init(struct BattFsSuper *d);
+bool battfs_mount(struct BattFsSuper *d);
bool battfs_fsck(struct BattFsSuper *disk);
bool battfs_fsck(struct BattFsSuper *disk);
-bool battfs_close(struct BattFsSuper *disk);
+bool battfs_umount(struct BattFsSuper *disk);
bool battfs_fileExists(BattFsSuper *disk, inode_t inode);
bool battfs_fileopen(BattFsSuper *disk, BattFs *fd, inode_t inode, filemode_t mode);
bool battfs_fileExists(BattFsSuper *disk, inode_t inode);
bool battfs_fileopen(BattFsSuper *disk, BattFs *fd, inode_t inode, filemode_t mode);
static void testCheck(BattFsSuper *disk, pgcnt_t *reference)
{
static void testCheck(BattFsSuper *disk, pgcnt_t *reference)
{
- ASSERT(battfs_init(disk));
+ ASSERT(battfs_mount(disk));
ASSERT(battfs_fsck(disk));
for (int i = 0; i < disk->page_count; i++)
ASSERT(battfs_fsck(disk));
for (int i = 0; i < disk->page_count; i++)
kprintf("%04d ", reference[i]);
}
kputchar('\n');
kprintf("%04d ", reference[i]);
}
kputchar('\n');
exit(2);
}
}
ASSERT(battfs_fsck(disk));
exit(2);
}
}
ASSERT(battfs_fsck(disk));
}
static void diskNew(BattFsSuper *disk)
}
static void diskNew(BattFsSuper *disk)
- ASSERT(battfs_init(disk));
+ ASSERT(battfs_mount(disk));
ASSERT(battfs_fsck(disk));
ASSERT(!battfs_fileExists(disk, INEXISTENT_INODE));
ASSERT(battfs_fsck(disk));
ASSERT(!battfs_fileExists(disk, INEXISTENT_INODE));
ASSERT(kfile_close(&fd2.fd) == 0);
ASSERT(LIST_EMPTY(&disk->file_opened_list));
ASSERT(battfs_fsck(disk));
ASSERT(kfile_close(&fd2.fd) == 0);
ASSERT(LIST_EMPTY(&disk->file_opened_list));
ASSERT(battfs_fsck(disk));
- ASSERT(battfs_close(disk));
+ ASSERT(battfs_umount(disk));
TRACEMSG("10: passed\n");
}
TRACEMSG("10: passed\n");
}
- ASSERT(battfs_init(disk));
+ ASSERT(battfs_mount(disk));
ASSERT(battfs_fsck(disk));
ASSERT(battfs_fileopen(disk, &fd1, INODE, MODE));
ASSERT(kfile_read(&fd1.fd, buf, sizeof(buf)) == sizeof(buf));
ASSERT(battfs_fsck(disk));
ASSERT(battfs_fileopen(disk, &fd1, INODE, MODE));
ASSERT(kfile_read(&fd1.fd, buf, sizeof(buf)) == sizeof(buf));
ASSERT(kfile_close(&fd1.fd) == 0);
ASSERT(battfs_fsck(disk));
ASSERT(kfile_close(&fd1.fd) == 0);
ASSERT(battfs_fsck(disk));
- ASSERT(battfs_close(disk));
+ ASSERT(battfs_umount(disk));
TRACEMSG("11: passed\n");
}
TRACEMSG("11: passed\n");
}
- ASSERT(battfs_init(disk));
+ ASSERT(battfs_mount(disk));
ASSERT(battfs_fsck(disk));
ASSERT(battfs_fileopen(disk, &fd1, INODE, MODE));
ASSERT(battfs_fsck(disk));
ASSERT(battfs_fileopen(disk, &fd1, INODE, MODE));
ASSERT(kfile_close(&fd1.fd) == 0);
ASSERT(battfs_fsck(disk));
ASSERT(kfile_close(&fd1.fd) == 0);
ASSERT(battfs_fsck(disk));
- ASSERT(battfs_close(disk));
+ ASSERT(battfs_umount(disk));
TRACEMSG("12: passed\n");
}
TRACEMSG("12: passed\n");
}
for (size_t i = 0; i < sizeof(buf); i++)
buf[i] = i;
for (size_t i = 0; i < sizeof(buf); i++)
buf[i] = i;
- ASSERT(battfs_init(disk));
+ ASSERT(battfs_mount(disk));
ASSERT(battfs_fsck(disk));
ASSERT(battfs_fileopen(disk, &fd1, INODE, MODE));
ASSERT(kfile_write(&fd1.fd, buf, sizeof(buf)) == sizeof(buf));
ASSERT(battfs_fsck(disk));
ASSERT(battfs_fileopen(disk, &fd1, INODE, MODE));
ASSERT(kfile_write(&fd1.fd, buf, sizeof(buf)) == sizeof(buf));
ASSERT(kfile_close(&fd1.fd) == 0);
ASSERT(battfs_fsck(disk));
ASSERT(kfile_close(&fd1.fd) == 0);
ASSERT(battfs_fsck(disk));
- ASSERT(battfs_close(disk));
+ ASSERT(battfs_umount(disk));
TRACEMSG("13: passed\n");
}
TRACEMSG("13: passed\n");
}
- ASSERT(battfs_init(disk));
+ ASSERT(battfs_mount(disk));
ASSERT(battfs_fsck(disk));
ASSERT(battfs_fileopen(disk, &fd1, INODE, MODE));
ASSERT(battfs_fsck(disk));
ASSERT(battfs_fileopen(disk, &fd1, INODE, MODE));
ASSERT(kfile_close(&fd1.fd) == 0);
ASSERT(battfs_fsck(disk));
ASSERT(kfile_close(&fd1.fd) == 0);
ASSERT(battfs_fsck(disk));
- ASSERT(battfs_close(disk));
+ ASSERT(battfs_umount(disk));
TRACEMSG("14: passed\n");
}
TRACEMSG("14: passed\n");
}
inode_t INODE = 0;
unsigned int MODE = BATTFS_CREATE;
inode_t INODE = 0;
unsigned int MODE = BATTFS_CREATE;
- ASSERT(battfs_init(disk));
+ ASSERT(battfs_mount(disk));
ASSERT(battfs_fsck(disk));
ASSERT(battfs_fileopen(disk, &fd1, INODE, MODE));
for (int i = 0; i < FILE_SIZE / 2; i++)
ASSERT(battfs_fsck(disk));
ASSERT(battfs_fileopen(disk, &fd1, INODE, MODE));
for (int i = 0; i < FILE_SIZE / 2; i++)
ASSERT(fd1.fd.size == FILE_SIZE / 2);
ASSERT(kfile_close(&fd1.fd) == 0);
ASSERT(battfs_fsck(disk));
ASSERT(fd1.fd.size == FILE_SIZE / 2);
ASSERT(kfile_close(&fd1.fd) == 0);
ASSERT(battfs_fsck(disk));
- ASSERT(battfs_close(disk));
+ ASSERT(battfs_umount(disk));
- ASSERT(battfs_init(disk));
+ ASSERT(battfs_mount(disk));
ASSERT(battfs_fsck(disk));
ASSERT(battfs_fileopen(disk, &fd1, INODE, 0));
ASSERT(fd1.fd.size == FILE_SIZE / 2);
ASSERT(battfs_fsck(disk));
ASSERT(battfs_fileopen(disk, &fd1, INODE, 0));
ASSERT(fd1.fd.size == FILE_SIZE / 2);
ASSERT(fd1.fd.seek_pos == FILE_SIZE / 2);
ASSERT(kfile_close(&fd1.fd) == 0);
ASSERT(battfs_fsck(disk));
ASSERT(fd1.fd.seek_pos == FILE_SIZE / 2);
ASSERT(kfile_close(&fd1.fd) == 0);
ASSERT(battfs_fsck(disk));
- ASSERT(battfs_close(disk));
+ ASSERT(battfs_umount(disk));
TRACEMSG("15: passed\n");
TRACEMSG("15: passed\n");
unsigned int MODE = BATTFS_CREATE;
uint8_t buf[1000];
unsigned int MODE = BATTFS_CREATE;
uint8_t buf[1000];
- ASSERT(battfs_init(disk));
+ ASSERT(battfs_mount(disk));
ASSERT(battfs_fsck(disk));
ASSERT(battfs_fileopen(disk, &fd1, INODE, MODE));
ASSERT(battfs_fsck(disk));
ASSERT(battfs_fileopen(disk, &fd1, INODE, MODE));
}
ASSERT(kfile_close(&fd1.fd) == 0);
ASSERT(battfs_fsck(disk));
}
ASSERT(kfile_close(&fd1.fd) == 0);
ASSERT(battfs_fsck(disk));
- ASSERT(battfs_close(disk));
+ ASSERT(battfs_umount(disk));
- ASSERT(battfs_init(disk));
+ ASSERT(battfs_mount(disk));
ASSERT(battfs_fsck(disk));
ASSERT(disk->free_bytes == disk->disk_size - sizeof(buf));
ASSERT(battfs_fileopen(disk, &fd1, INODE, 0));
ASSERT(battfs_fsck(disk));
ASSERT(disk->free_bytes == disk->disk_size - sizeof(buf));
ASSERT(battfs_fileopen(disk, &fd1, INODE, 0));
ASSERT(buf[i] == ((j-1+i) & 0xff));
ASSERT(kfile_close(&fd1.fd) == 0);
ASSERT(battfs_fsck(disk));
ASSERT(buf[i] == ((j-1+i) & 0xff));
ASSERT(kfile_close(&fd1.fd) == 0);
ASSERT(battfs_fsck(disk));
- ASSERT(battfs_close(disk));
+ ASSERT(battfs_umount(disk));
TRACEMSG("16: passed\n");
TRACEMSG("16: passed\n");
unsigned int MODE = BATTFS_CREATE;
uint8_t buf[1000];
unsigned int MODE = BATTFS_CREATE;
uint8_t buf[1000];
- ASSERT(battfs_init(disk));
+ ASSERT(battfs_mount(disk));
ASSERT(battfs_fsck(disk));
ASSERT(battfs_fileopen(disk, &fd1, INODE1, MODE));
ASSERT(battfs_fileopen(disk, &fd2, INODE2, MODE));
ASSERT(battfs_fsck(disk));
ASSERT(battfs_fileopen(disk, &fd1, INODE1, MODE));
ASSERT(battfs_fileopen(disk, &fd2, INODE2, MODE));
ASSERT(kfile_close(&fd1.fd) == 0);
ASSERT(kfile_close(&fd2.fd) == 0);
ASSERT(battfs_fsck(disk));
ASSERT(kfile_close(&fd1.fd) == 0);
ASSERT(kfile_close(&fd2.fd) == 0);
ASSERT(battfs_fsck(disk));
- ASSERT(battfs_close(disk));
+ ASSERT(battfs_umount(disk));
TRACEMSG("17: passed\n");
}
TRACEMSG("17: passed\n");
}
- ASSERT(battfs_init(disk));
+ ASSERT(battfs_mount(disk));
ASSERT(battfs_fsck(disk));
ASSERT(battfs_fileopen(disk, &fd1, INODE, MODE));
ASSERT(kfile_seek(&fd1.fd, fd1.fd.size + 10, SEEK_SET) == fd1.fd.size + 10);
ASSERT(battfs_fsck(disk));
ASSERT(battfs_fileopen(disk, &fd1, INODE, MODE));
ASSERT(kfile_seek(&fd1.fd, fd1.fd.size + 10, SEEK_SET) == fd1.fd.size + 10);
ASSERT(kfile_close(&fd1.fd) == 0);
ASSERT(battfs_fsck(disk));
ASSERT(kfile_close(&fd1.fd) == 0);
ASSERT(battfs_fsck(disk));
- ASSERT(battfs_close(disk));
+ ASSERT(battfs_umount(disk));
TRACEMSG("18: passed\n");
}
TRACEMSG("18: passed\n");
}
for (int i = 0; i < 2; i++)
buf[i] = i;
for (int i = 0; i < 2; i++)
buf[i] = i;
- ASSERT(battfs_init(disk));
+ ASSERT(battfs_mount(disk));
ASSERT(battfs_fsck(disk));
disk_size_t prev_free = disk->free_bytes;
ASSERT(battfs_fileopen(disk, &fd1, INODE, MODE));
ASSERT(battfs_fsck(disk));
disk_size_t prev_free = disk->free_bytes;
ASSERT(battfs_fileopen(disk, &fd1, INODE, MODE));
ASSERT(kfile_close(&fd1.fd) == 0);
ASSERT(battfs_fsck(disk));
ASSERT(kfile_close(&fd1.fd) == 0);
ASSERT(battfs_fsck(disk));
- ASSERT(battfs_close(disk));
+ ASSERT(battfs_umount(disk));
TRACEMSG("19: passed\n");
TRACEMSG("19: passed\n");
disk->erase(disk, 3);
fclose(fp);
disk->erase(disk, 3);
fclose(fp);
- ASSERT(battfs_init(disk));
+ ASSERT(battfs_mount(disk));
ASSERT(battfs_fsck(disk));
ASSERT(battfs_fileopen(disk, &fd1, INODE, MODE));
ASSERT(kfile_write(&fd1.fd, buf, sizeof(buf)) == PAGE_FILL * 4);
ASSERT(battfs_fsck(disk));
ASSERT(battfs_fileopen(disk, &fd1, INODE, MODE));
ASSERT(kfile_write(&fd1.fd, buf, sizeof(buf)) == PAGE_FILL * 4);
ASSERT(kfile_close(&fd1.fd) == 0);
ASSERT(battfs_fsck(disk));
ASSERT(kfile_close(&fd1.fd) == 0);
ASSERT(battfs_fsck(disk));
- ASSERT(battfs_close(disk));
+ ASSERT(battfs_umount(disk));
TRACEMSG("20: passed\n");
}
TRACEMSG("20: passed\n");
}
unsigned int MODE = BATTFS_CREATE;
uint32_t buf[FILE_SIZE / (4 * N_FILES * sizeof(uint32_t))];
unsigned int MODE = BATTFS_CREATE;
uint32_t buf[FILE_SIZE / (4 * N_FILES * sizeof(uint32_t))];
- ASSERT(battfs_init(disk));
+ ASSERT(battfs_mount(disk));
ASSERT(battfs_fsck(disk));
for (inode_t i = 0; i < N_FILES; i++)
ASSERT(battfs_fileopen(disk, &fd[i], i, MODE));
ASSERT(battfs_fsck(disk));
for (inode_t i = 0; i < N_FILES; i++)
ASSERT(battfs_fileopen(disk, &fd[i], i, MODE));
ASSERT(kfile_close(&fd[i].fd) == 0);
ASSERT(battfs_fsck(disk));
ASSERT(kfile_close(&fd[i].fd) == 0);
ASSERT(battfs_fsck(disk));
- ASSERT(battfs_close(disk));
+ ASSERT(battfs_umount(disk));
- ASSERT(battfs_init(disk));
+ ASSERT(battfs_mount(disk));
ASSERT(battfs_fsck(disk));
for (inode_t i = 0; i < N_FILES; i++)
ASSERT(battfs_fsck(disk));
for (inode_t i = 0; i < N_FILES; i++)
for (inode_t i = 0; i < N_FILES; i++)
ASSERT(kfile_close(&fd[i].fd) == 0);
for (inode_t i = 0; i < N_FILES; i++)
ASSERT(kfile_close(&fd[i].fd) == 0);
- ASSERT(battfs_close(disk));
+ ASSERT(battfs_umount(disk));
TRACEMSG("21: passed\n");
}
TRACEMSG("21: passed\n");
}