drinkingtea/ox
2
0
Fork 0
Code Issues Pull Requests Actions Releases Wiki Activity

Put prev back in.

Browse Source
This commit is contained in:
Gary Talent
2016-07-02 01:33:56 -05:00
parent f7d136bbc4
commit 490bf2f8e8
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ox/fs/filestore.hpp
+5 -6
View File
@@ -29,7 +29,7 @@ class FileStore {
private: private:
struct Inode { struct Inode {
// the next Inode in memory // the next Inode in memory
FsSize_t next; FsSize_t prev, next;
// The following variables should not be assumed to exist // The following variables should not be assumed to exist
FsSize_t dataLen; FsSize_t dataLen;
@@ -49,7 +49,6 @@ class FileStore {
uint32_t m_version; uint32_t m_version;
FsSize_t m_size; FsSize_t m_size;
FsSize_t m_rootInode; FsSize_t m_rootInode;
FsSize_t m_lastInode;
public: public:
/** /**
@@ -262,7 +261,8 @@ void *FileStore<FsSize_t>::alloc(FsSize_t size) {
const auto inode = ptr<Inode*>(retval); const auto inode = ptr<Inode*>(retval);
memset(inode, 0, size); memset(inode, 0, size);
inode->next = retval + size; inode->next = retval + size;
m_lastInode = retval; ptr<Inode*>(m_rootInode)->prev = retval;
ptr<Inode*>(inode->next)->prev = retval;
return inode; return inode;
} }
@@ -319,7 +319,7 @@ typename FileStore<FsSize_t>::Inode *FileStore<FsSize_t>::firstInode() {
template<typename FsSize_t> template<typename FsSize_t>
typename FileStore<FsSize_t>::Inode *FileStore<FsSize_t>::lastInode() { typename FileStore<FsSize_t>::Inode *FileStore<FsSize_t>::lastInode() {
return ptr<Inode*>(m_lastInode); return ptr<Inode*>(ptr<Inode*>(m_rootInode)->prev);
} }
template<typename FsSize_t> template<typename FsSize_t>
@@ -335,9 +335,8 @@ uint8_t *FileStore<FsSize_t>::format(uint8_t *buffer, FsSize_t size) {
fs->m_version = FileStore<FsSize_t>::version(); fs->m_version = FileStore<FsSize_t>::version();
fs->m_size = size; fs->m_size = size;
fs->m_rootInode = sizeof(FileStore<FsSize_t>); fs->m_rootInode = sizeof(FileStore<FsSize_t>);
fs->m_lastInode = sizeof(FileStore<FsSize_t>);
fs->lastInode()->m_id = 0; fs->lastInode()->m_id = 0;
fs->lastInode()->next = fs->m_lastInode; fs->lastInode()->next = sizeof(FileStore<FsSize_t>);
return (uint8_t*) buffer; return (uint8_t*) buffer;
} }