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

scoutfs: specify btree root

Browse Source 
The btree functions currently don't take a specific root argument.  They
assume, deep down in btree_walk, that there's only one btree in the
system.  We're going to be adding a few more to support richer
allocation.

To prepare for this we have the btree functions take an explicit btree
argument.  This should make no functional difference.

Signed-off-by: Zach Brown <zab@versity.com>
This commit is contained in:
Zach Brown
2016-09-21 10:04:07 -07:00
parent d2a696f4bd
commit 2bed78c269
8 changed files with 146 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files
kmod/src/inode.c
+11 -6
View File
@@ -127,12 +127,13 @@ static int scoutfs_read_locked_inode(struct inode *inode)
{
DECLARE_SCOUTFS_BTREE_CURSOR(curs);
struct super_block *sb = inode->i_sb;
struct scoutfs_btree_root *meta = SCOUTFS_META(sb);
struct scoutfs_key key;
int ret;
scoutfs_set_key(&key, scoutfs_ino(inode), SCOUTFS_INODE_KEY, 0);
ret = scoutfs_btree_lookup(sb, &key, &curs);
ret = scoutfs_btree_lookup(sb, meta, &key, &curs);
if (!ret) {
load_inode(inode, curs.val);
scoutfs_btree_release(&curs);
@@ -228,12 +229,13 @@ 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;
struct scoutfs_btree_root *meta = SCOUTFS_META(sb);
struct scoutfs_key key;
int ret;
scoutfs_set_key(&key, scoutfs_ino(inode), SCOUTFS_INODE_KEY, 0);
ret = scoutfs_btree_dirty(sb, &key);
ret = scoutfs_btree_dirty(sb, meta, &key);
if (!ret)
trace_scoutfs_dirty_inode(inode);
return ret;
@@ -252,12 +254,13 @@ void scoutfs_update_inode_item(struct inode *inode)
{
DECLARE_SCOUTFS_BTREE_CURSOR(curs);
struct super_block *sb = inode->i_sb;
struct scoutfs_btree_root *meta = SCOUTFS_META(sb);
struct scoutfs_key key;
int err;
scoutfs_set_key(&key, scoutfs_ino(inode), SCOUTFS_INODE_KEY, 0);
err = scoutfs_btree_update(sb, &key, &curs);
err = scoutfs_btree_update(sb, meta, &key, &curs);
BUG_ON(err);
store_inode(curs.val, inode);
@@ -309,6 +312,7 @@ static int alloc_ino(struct super_block *sb, u64 *ino)
struct inode *scoutfs_new_inode(struct super_block *sb, struct inode *dir,
umode_t mode, dev_t rdev)
{
struct scoutfs_btree_root *meta = SCOUTFS_META(sb);
DECLARE_SCOUTFS_BTREE_CURSOR(curs);
struct scoutfs_inode_info *ci;
struct scoutfs_key key;
@@ -338,7 +342,7 @@ 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_btree_insert(inode->i_sb, &key,
ret = scoutfs_btree_insert(inode->i_sb, meta, &key,
sizeof(struct scoutfs_inode), &curs);
if (ret) {
iput(inode);
@@ -354,6 +358,7 @@ struct inode *scoutfs_new_inode(struct super_block *sb, struct inode *dir,
*/
static void drop_inode_items(struct super_block *sb, u64 ino)
{
struct scoutfs_btree_root *meta = SCOUTFS_META(sb);
DECLARE_SCOUTFS_BTREE_CURSOR(curs);
struct scoutfs_inode *sinode;
struct scoutfs_key key;
@@ -363,7 +368,7 @@ static void drop_inode_items(struct super_block *sb, u64 ino)
/* sample the inode mode */
scoutfs_set_key(&key, ino, SCOUTFS_INODE_KEY, 0);
ret = scoutfs_btree_lookup(sb, &key, &curs);
ret = scoutfs_btree_lookup(sb, meta, &key, &curs);
if (ret)
goto out;
@@ -387,7 +392,7 @@ static void drop_inode_items(struct super_block *sb, u64 ino)
if (ret)
goto out;
ret = scoutfs_btree_delete(sb, &key);
ret = scoutfs_btree_delete(sb, meta, &key);
out:
if (ret)
trace_printk("drop items failed ret %d ino %llu\n", ret, ino);