btrfs-progs: dump-tree: print c/o/s/r time of ROOT_ITEM

[platform/upstream/btrfs-progs.git] / extent-tree.c

diff --git a/extent-tree.c b/extent-tree.c
index 81a17a3..055582c 100644 (file)
--- a/extent-tree.c
+++ b/extent-tree.c
@@ -284,7 +284,7 @@ out:
        if (!cache) {
                printk("Unable to find block group for %llu\n",
                        (unsigned long long)search_start);
-               WARN_ON(1);
+               return -ENOENT;
        }
        return -ENOSPC;
 
@@ -2663,8 +2663,7 @@ int btrfs_reserve_extent(struct btrfs_trans_handle *trans,
                alloc_profile = info->avail_data_alloc_bits &
                                info->data_alloc_profile;
                data = BTRFS_BLOCK_GROUP_DATA | alloc_profile;
-       } else if ((info->system_allocs > 0 || root == info->chunk_root) &&
-                  info->system_allocs >= 0) {
+       } else if (info->system_allocs == 1 || root == info->chunk_root) {
                alloc_profile = info->avail_system_alloc_bits &
                                info->system_alloc_profile;
                data = BTRFS_BLOCK_GROUP_SYSTEM | alloc_profile;
@@ -2691,7 +2690,8 @@ int btrfs_reserve_extent(struct btrfs_trans_handle *trans,
                               search_start, search_end, hint_byte, ins,
                               trans->alloc_exclude_start,
                               trans->alloc_exclude_nr, data);
-       BUG_ON(ret);
+       if (ret < 0)
+               return ret;
        clear_extent_dirty(&info->free_space_cache,
                           ins->objectid, ins->objectid + ins->offset - 1);
        return ret;
@@ -3725,7 +3725,7 @@ static int free_block_group_cache(struct btrfs_trans_handle *trans,
                btrfs_remove_free_space_cache(cache);
                kfree(cache->free_space_ctl);
        }
-       clear_extent_bits(&fs_info->block_group_cache, bytenr, bytenr + len,
+       clear_extent_bits(&fs_info->block_group_cache, bytenr, bytenr + len - 1,
                          (unsigned int)-1);
        ret = free_space_info(fs_info, flags, len, 0, NULL);
        if (ret < 0)
@@ -3841,7 +3841,7 @@ out:
 int btrfs_fix_block_accounting(struct btrfs_trans_handle *trans,
                               struct btrfs_root *root)
 {
-       int ret;
+       int ret = 0;
        int slot;
        u64 start = 0;
        u64 bytes_used = 0;
@@ -3905,13 +3905,16 @@ int btrfs_fix_block_accounting(struct btrfs_trans_handle *trans,
                        bytes_used += fs_info->nodesize;
                        ret = btrfs_update_block_group(trans, root,
                                  key.objectid, fs_info->nodesize, 1, 0);
-                       BUG_ON(ret);
+                       if (ret)
+                               goto out;
                }
                path.slots[0]++;
        }
        btrfs_set_super_bytes_used(root->fs_info->super_copy, bytes_used);
+       ret = 0;
+out:
        btrfs_release_path(&path);
-       return 0;
+       return ret;
 }
 
 static void __get_extent_size(struct btrfs_root *root, struct btrfs_path *path,