Commit f6a39829 authored by Josef Bacik's avatar Josef Bacik

Btrfs: fix duplicate checking logic

When merging my code into the integration test the second check for duplicate
entries got screwed up.  This patch fixes it by dropping ret2 and just using ret
for the return value, and checking if we got an error before adding the bitmap
to the local list.  Thanks,
Signed-off-by: default avatarJosef Bacik <josef@redhat.com>
parent 723bda20
...@@ -250,7 +250,7 @@ int __load_free_space_cache(struct btrfs_root *root, struct inode *inode, ...@@ -250,7 +250,7 @@ int __load_free_space_cache(struct btrfs_root *root, struct inode *inode,
pgoff_t index = 0; pgoff_t index = 0;
unsigned long first_page_offset; unsigned long first_page_offset;
int num_checksums; int num_checksums;
int ret = 0, ret2; int ret = 0;
INIT_LIST_HEAD(&bitmaps); INIT_LIST_HEAD(&bitmaps);
...@@ -421,11 +421,10 @@ int __load_free_space_cache(struct btrfs_root *root, struct inode *inode, ...@@ -421,11 +421,10 @@ int __load_free_space_cache(struct btrfs_root *root, struct inode *inode,
goto free_cache; goto free_cache;
} }
spin_lock(&ctl->tree_lock); spin_lock(&ctl->tree_lock);
ret2 = link_free_space(ctl, e); ret = link_free_space(ctl, e);
ctl->total_bitmaps++; ctl->total_bitmaps++;
ctl->op->recalc_thresholds(ctl); ctl->op->recalc_thresholds(ctl);
spin_unlock(&ctl->tree_lock); spin_unlock(&ctl->tree_lock);
list_add_tail(&e->list, &bitmaps);
if (ret) { if (ret) {
printk(KERN_ERR "Duplicate entries in " printk(KERN_ERR "Duplicate entries in "
"free space cache, dumping\n"); "free space cache, dumping\n");
...@@ -434,6 +433,7 @@ int __load_free_space_cache(struct btrfs_root *root, struct inode *inode, ...@@ -434,6 +433,7 @@ int __load_free_space_cache(struct btrfs_root *root, struct inode *inode,
page_cache_release(page); page_cache_release(page);
goto free_cache; goto free_cache;
} }
list_add_tail(&e->list, &bitmaps);
} }
num_entries--; num_entries--;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment