mirrors/scoutfs
1
0
Fork 0
mirror of https://github.com/versity/scoutfs.git synced 2026-02-07 11:10:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

scoutfs: Don't use stale root in get_manifest_refs

Browse Source 
get_manifest_refs was using the btree root in its stale copy of the
super block.  It is supposed to use the btree root that it was given by
its caller who went to the trouble of finding a sufficiently current
btree root.

Signed-off-by: Mark Fasheh <mfasheh@versity.com>
[zab: added commit message and fixed formatting]
Signed-off-by: Zach Brown <zab@versity.com>
This commit is contained in:
Mark Fasheh
2017-07-19 18:41:51 -05:00
committed by Zach Brown
parent a65b28d440
commit 4ff2148f10
1 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
kmod/src/manifest.c
View File

@@ -459,7 +459,6 @@ static int get_manifest_refs(struct super_block *sb,
struct list_head *ref_list)
{
DECLARE_MANIFEST(sb, mani);
struct scoutfs_super_block *super = &SCOUTFS_SB(sb)->super;
struct scoutfs_manifest_btree_key *mkey;
struct scoutfs_manifest_entry ment;
SCOUTFS_BTREE_ITEM_REF(iref);
@@ -475,8 +474,7 @@ static int get_manifest_refs(struct super_block *sb,
/* get level 0 segments that overlap with the missing range */
mkey_len = init_btree_key(mkey, 0, ~0ULL, NULL);
ret = scoutfs_btree_prev(sb, &super->manifest.root,
mkey, mkey_len, &iref);
ret = scoutfs_btree_prev(sb, root, mkey, mkey_len, &iref);
while (ret == 0) {
init_ment_iref(&ment, &iref);
@@ -488,8 +486,8 @@ static int get_manifest_refs(struct super_block *sb,
}
swap(prev, iref);
ret = scoutfs_btree_before(sb, &super->manifest.root,
prev.key, prev.key_len, &iref);
ret = scoutfs_btree_before(sb, root, prev.key, prev.key_len,
&iref);
scoutfs_btree_put_iref(&prev);
}
if (ret != -ENOENT)
@@ -507,9 +505,8 @@ static int get_manifest_refs(struct super_block *sb,
/* XXX should use level counts to skip searches */
scoutfs_btree_put_iref(&iref);
ret = btree_prev_overlap_or_next(sb, &super->manifest.root,
mkey, mkey_len, key, i,
&iref);
ret = btree_prev_overlap_or_next(sb, root, mkey, mkey_len, key,
i, &iref);
if (ret < 0) {
if (ret == -ENOENT)
ret = 0;