mirrors/scoutfs
1
0
Fork 0
mirror of https://github.com/versity/scoutfs.git synced 2026-09-26 01:44:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

scoutfs: first step towards multiple btrees

Browse Source 
Starting to implement LSM merging made me really question if it is the
right approach.  I'd like to try an experiment to see if we can get our
concurrent writes done with much simpler btrees.

This commit removes all the functionality that derives from the large
LSM segments and distributing the manifest.

What's left is a multi-page block layer and the husk of the btree
implementation which will give people access to items.  Callers that
work with items get translated to the btree interface.

This gets as far as reading the super block but the format changes and
large block size mean that the crc check fails and the mount returns an
error.

Signed-off-by: Zach Brown <zab@versity.com>
This commit is contained in:
Zach Brown
2016-04-11 11:35:37 -07:00
parent a07b41fa8b
commit 5369fa1e05
28 changed files with 373 additions and 3788 deletions
Download Patch File Download Diff File Expand all files Collapse all files
kmod/src/inode.c
+20 -17
View File
@@ -19,7 +19,7 @@
#include "super.h"
#include "key.h"
#include "inode.h"
#include "segment.h"
#include "btree.h"
#include "dir.h"
#include "filerw.h"
#include "scoutfs_trace.h"
@@ -112,17 +112,17 @@ static void load_inode(struct inode *inode, struct scoutfs_inode *cinode)
static int scoutfs_read_locked_inode(struct inode *inode)
{
struct scoutfs_btree_cursor curs = {NULL,};
struct super_block *sb = inode->i_sb;
DECLARE_SCOUTFS_ITEM_REF(ref);
struct scoutfs_key key;
int ret;
scoutfs_set_key(&key, scoutfs_ino(inode), SCOUTFS_INODE_KEY, 0);
ret = scoutfs_read_item(sb, &key, &ref);
ret = scoutfs_btree_lookup(sb, &key, &curs);
if (!ret) {
load_inode(inode, ref.val);
scoutfs_put_ref(&ref);
load_inode(inode, curs.val);
scoutfs_btree_release(&curs);
}
return 0;
@@ -213,16 +213,17 @@ static void store_inode(struct scoutfs_inode *cinode, struct inode *inode)
int scoutfs_dirty_inode_item(struct inode *inode)
{
struct super_block *sb = inode->i_sb;
DECLARE_SCOUTFS_ITEM_REF(ref);
struct scoutfs_btree_cursor curs = {NULL,};
struct scoutfs_key key;
int ret;
scoutfs_set_key(&key, scoutfs_ino(inode), SCOUTFS_INODE_KEY, 0);
ret = scoutfs_dirty_item(sb, &key, sizeof(struct scoutfs_inode), &ref);
ret = scoutfs_btree_dirty(sb, &key, sizeof(struct scoutfs_inode),
&curs);
if (!ret) {
store_inode(ref.val, inode);
scoutfs_put_ref(&ref);
store_inode(curs.val, inode);
scoutfs_btree_release(&curs);
trace_scoutfs_dirty_inode(inode);
}
return ret;
@@ -239,18 +240,20 @@ int scoutfs_dirty_inode_item(struct inode *inode)
*/
void scoutfs_update_inode_item(struct inode *inode)
{
struct scoutfs_btree_cursor curs = {NULL,};
struct super_block *sb = inode->i_sb;
DECLARE_SCOUTFS_ITEM_REF(ref);
struct scoutfs_key key;
int ret;
scoutfs_set_key(&key, scoutfs_ino(inode), SCOUTFS_INODE_KEY, 0);
ret = scoutfs_read_item(sb, &key, &ref);
/* XXX maybe just use dirty again? not sure.. */
ret = scoutfs_btree_dirty(sb, &key, sizeof(struct scoutfs_inode),
&curs);
BUG_ON(ret);
store_inode(ref.val, inode);
scoutfs_put_ref(&ref);
store_inode(curs.val, inode);
scoutfs_btree_release(&curs);
trace_scoutfs_update_inode(inode);
}
@@ -262,8 +265,8 @@ struct inode *scoutfs_new_inode(struct super_block *sb, struct inode *dir,
umode_t mode, dev_t rdev)
{
struct scoutfs_sb_info *sbi = SCOUTFS_SB(sb);
struct scoutfs_btree_cursor curs = {NULL,};
struct scoutfs_inode_info *ci;
DECLARE_SCOUTFS_ITEM_REF(ref);
struct scoutfs_key key;
struct inode *inode;
int ret;
@@ -285,14 +288,14 @@ struct inode *scoutfs_new_inode(struct super_block *sb, struct inode *dir,
scoutfs_set_key(&key, scoutfs_ino(inode), SCOUTFS_INODE_KEY, 0);
ret = scoutfs_create_item(inode->i_sb, &key,
sizeof(struct scoutfs_inode), &ref);
ret = scoutfs_btree_insert(inode->i_sb, &key,
sizeof(struct scoutfs_inode), &curs);
if (ret) {
iput(inode);
return ERR_PTR(ret);
}
scoutfs_put_ref(&ref);
scoutfs_btree_release(&curs);
return inode;
}