mirrors/scoutfs
1
0
Fork 0
mirror of https://github.com/versity/scoutfs.git synced 2026-09-29 03:05:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

scoutfs: fs uses item cache instead of forest

Browse Source 
Use the new item cache for all the item work in the fs instead of
calling into the forest of btrees.  Most of this is mechanical
conversion from the _forest calls to the _item calls.  The item cache
no longer supports the kvec argument for describing values so all the
callers pass in the value pointer and length directly.

The item cache doesn't support saving items as they're deleted and later
restoring them from an error unwinding path.  There were only two users
of this.  Directory entries can easily guarantee that deletion won't
fail by dirtying the items first in the item cache.  Xattr updates were
a little trickier.  They can combine dirtying, creating, updating, and
deleting to atomically switch between items that describe different
versions of a multi-item value.  This also fixed a bug in the srch
xattrs where replacing an xattr would create a new id for the xattr and
leave existing srch items referencing a now deleted id.  Replacing now
reuses the old id.

And finally we add back in the locking and transaction item cache
integration.

Signed-off-by: Zach Brown <zab@versity.com>
This commit is contained in:
Zach Brown
2020-08-26 14:39:12 -07:00
committed by Zach Brown
parent 45e594396f
commit 6bacd95aea
7 changed files with 236 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files
kmod/src/data.c
+11 -12
View File
@@ -27,11 +27,10 @@
#include "inode.h"
#include "key.h"
#include "data.h"
#include "kvec.h"
#include "trans.h"
#include "counters.h"
#include "scoutfs_trace.h"
#include "forest.h"
#include "item.h"
#include "ioctl.h"
#include "btree.h"
#include "lock.h"
@@ -323,7 +322,6 @@ static int load_unpacked_extents(struct super_block *sb, u64 ino,
struct rb_node *parent;
struct rb_node **node;
void *buf = NULL;
struct kvec val;
u64 prev_blkno;
bool saw_final;
int size;
@@ -359,13 +357,16 @@ static int load_unpacked_extents(struct super_block *sb, u64 ino,
for (p = 0; !saw_final; p++) {
init_packed_extent_key(&key, ino, iblock, p);
kvec_init(&val, buf, SCOUTFS_PACKEXT_MAX_BYTES);
/* maybe search for next initial item, lookup more parts */
if (p == 0 && last > iblock)
ret = scoutfs_forest_next(sb, &key, &end, &val, lock);
ret = scoutfs_item_next(sb, &key, &end, buf,
SCOUTFS_PACKEXT_MAX_BYTES,
lock);
else
ret = scoutfs_forest_lookup(sb, &key, &val, lock);
ret = scoutfs_item_lookup(sb, &key, buf,
SCOUTFS_PACKEXT_MAX_BYTES,
lock);
if (ret < 0) {
if (p == 0 && ret == -ENOENT && empty_enoent)
ret = 0;
@@ -475,7 +476,6 @@ static int store_packed_extents(struct super_block *sb, u64 ino,
struct unpacked_extent *final;
struct unpacked_extent *ext;
struct scoutfs_key key;
struct kvec val;
void *buf = NULL;
u64 prev_blkno;
u64 iblock;
@@ -491,7 +491,7 @@ static int store_packed_extents(struct super_block *sb, u64 ino,
if (RB_EMPTY_ROOT(&unpe->extents)) {
for (p = 0; p < unpe->existing_parts; p++) {
init_packed_extent_key(&key, ino, unpe->iblock, p);
ret = scoutfs_forest_delete(sb, &key, lock);
ret = scoutfs_item_delete(sb, &key, lock);
BUG_ON(ret); /* XXX inconsistent between parts */
}
unpe->existing_parts = 0;
@@ -544,11 +544,10 @@ static int store_packed_extents(struct super_block *sb, u64 ino,
/* store full item or after packing final extent */
init_packed_extent_key(&key, ino, unpe->iblock, p);
kvec_init(&val, buf, size);
if (p < unpe->existing_parts)
ret = scoutfs_forest_update(sb, &key, &val, lock);
ret = scoutfs_item_update(sb, &key, buf, size, lock);
else
ret = scoutfs_forest_create(sb, &key, &val, lock);
ret = scoutfs_item_create(sb, &key, buf, size, lock);
BUG_ON(ret); /* XXX inconsistent between parts */
pe = buf;
@@ -560,7 +559,7 @@ static int store_packed_extents(struct super_block *sb, u64 ino,
/* delete any remaining previous part items */
for (i = p; i < unpe->existing_parts; i++) {
init_packed_extent_key(&key, ino, unpe->iblock, i);
ret = scoutfs_forest_delete(sb, &key, lock);
ret = scoutfs_item_delete(sb, &key, lock);
BUG_ON(ret); /* XXX inconsistent between parts */
}