mirrors/scoutfs
1
0
Fork 0
mirror of https://github.com/versity/scoutfs.git synced 2026-06-09 13:12:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

scoutfs: remove btree _before and _after

Browse Source 
There's no users of these variants of _prev and _next so they can be
removed.  Support for them was also dropped in the previous reworking of
the internal structure of the btree blocks.

Signed-off-by: Zach Brown <zab@versity.com>
This commit is contained in:
Zach Brown
2020-04-29 14:51:11 -07:00
committed by Zach Brown
parent efd9763355
commit ac0e58839d
2 changed files with 5 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
kmod/src/btree.c
View File

@@ -78,13 +78,11 @@
/* btree walking has a bunch of behavioural bit flags */
enum {
BTW_NEXT = (1 << 0), /* return >= key */
BTW_AFTER = (1 << 1), /* return > key */
BTW_PREV = (1 << 2), /* return <= key */
BTW_BEFORE = (1 << 3), /* return < key */
BTW_DIRTY = (1 << 4), /* cow stable blocks */
BTW_ALLOC = (1 << 5), /* allocate a new block for 0 ref */
BTW_INSERT = (1 << 6), /* walking to insert, try splitting */
BTW_DELETE = (1 << 7), /* walking to delete, try joining */
BTW_PREV = (1 << 1), /* return <= key */
BTW_DIRTY = (1 << 2), /* cow stable blocks */
BTW_ALLOC = (1 << 3), /* allocate a new block for 0 ref */
BTW_INSERT = (1 << 4), /* walking to insert, try splitting */
BTW_DELETE = (1 << 5), /* walking to delete, try joining */
};
/* total length of the value payload */
@@ -1500,13 +1498,6 @@ int scoutfs_btree_next(struct super_block *sb, struct scoutfs_btree_root *root,
return btree_iter(sb, root, BTW_NEXT, key, iref);
}
int scoutfs_btree_after(struct super_block *sb, struct scoutfs_btree_root *root,
struct scoutfs_key *key,
struct scoutfs_btree_item_ref *iref)
{
return btree_iter(sb, root, BTW_NEXT | BTW_AFTER, key, iref);
}
int scoutfs_btree_prev(struct super_block *sb, struct scoutfs_btree_root *root,
struct scoutfs_key *key,
struct scoutfs_btree_item_ref *iref)
@@ -1514,14 +1505,6 @@ int scoutfs_btree_prev(struct super_block *sb, struct scoutfs_btree_root *root,
return btree_iter(sb, root, BTW_PREV, key, iref);
}
int scoutfs_btree_before(struct super_block *sb,
struct scoutfs_btree_root *root,
struct scoutfs_key *key,
struct scoutfs_btree_item_ref *iref)
{
return btree_iter(sb, root, BTW_PREV | BTW_BEFORE, key, iref);
}
/*
* Ensure that the blocks that lead to the item with the given key are
* dirty. caller can hold a transaction to pin the dirty blocks and

7
kmod/src/btree.h
View File

@@ -49,16 +49,9 @@ int scoutfs_btree_delete(struct super_block *sb,
int scoutfs_btree_next(struct super_block *sb, struct scoutfs_btree_root *root,
struct scoutfs_key *key,
struct scoutfs_btree_item_ref *iref);
int scoutfs_btree_after(struct super_block *sb, struct scoutfs_btree_root *root,
struct scoutfs_key *key,
struct scoutfs_btree_item_ref *iref);
int scoutfs_btree_prev(struct super_block *sb, struct scoutfs_btree_root *root,
struct scoutfs_key *key,
struct scoutfs_btree_item_ref *iref);
int scoutfs_btree_before(struct super_block *sb,
struct scoutfs_btree_root *root,
struct scoutfs_key *key,
struct scoutfs_btree_item_ref *iref);
int scoutfs_btree_dirty(struct super_block *sb,
struct scoutfs_radix_allocator *alloc,
struct scoutfs_block_writer *wri,