btrfs-progs: extent_io: Init eb->lru to avoid NULL pointer dereference

[platform/upstream/btrfs-progs.git] / qgroup-verify.c

diff --git a/qgroup-verify.c b/qgroup-verify.c
index aa575fb..571b4d4 100644 (file)
--- a/qgroup-verify.c
+++ b/qgroup-verify.c
@@ -27,7 +27,7 @@
 #include "disk-io.h"
 #include "print-tree.h"
 #include "utils.h"
-#include "ulist.h"
+#include "kernel-shared/ulist.h"
 #include "rbtree-utils.h"
 #include "transaction.h"
 #include "repair.h"
@@ -711,7 +711,7 @@ static int travel_tree(struct btrfs_fs_info *info, struct btrfs_root *root,
 //     printf("travel_tree: bytenr: %llu\tnum_bytes: %llu\tref_parent: %llu\n",
 //            bytenr, num_bytes, ref_parent);
 
-       eb = read_tree_block(root, bytenr, num_bytes, 0);
+       eb = read_tree_block(info, bytenr, 0);
        if (!extent_buffer_uptodate(eb))
                return -EIO;
 
@@ -736,7 +736,7 @@ static int travel_tree(struct btrfs_fs_info *info, struct btrfs_root *root,
        nr = btrfs_header_nritems(eb);
        for (i = 0; i < nr; i++) {
                new_bytenr = btrfs_node_blockptr(eb, i);
-               new_num_bytes = root->nodesize;
+               new_num_bytes = info->nodesize;
 
                ret = travel_tree(info, root, new_bytenr, new_num_bytes,
                                  ref_parent);
@@ -1185,7 +1185,7 @@ static int scan_extents(struct btrfs_fs_info *info,
                                bytenr = key.objectid;
                                num_bytes = key.offset;
                                if (key.type == BTRFS_METADATA_ITEM_KEY) {
-                                       num_bytes = info->extent_root->nodesize;
+                                       num_bytes = info->nodesize;
                                        meta = 1;
                                }
 
@@ -1496,7 +1496,7 @@ static int repair_qgroup_info(struct btrfs_fs_info *info,
        key.offset = count->qgroupid;
        ret = btrfs_search_slot(trans, root, &key, &path, 0, 1);
        if (ret) {
-               error("Could not find disk item for qgroup %llu/%llu.\n",
+               error("could not find disk item for qgroup %llu/%llu",
                      btrfs_qgroup_level(count->qgroupid),
                      btrfs_qgroup_subvid(count->qgroupid));
                if (ret > 0)
@@ -1550,7 +1550,7 @@ static int repair_qgroup_status(struct btrfs_fs_info *info)
        key.offset = 0;
        ret = btrfs_search_slot(trans, root, &key, &path, 0, 1);
        if (ret) {
-               error("Could not find qgroup status item\n");
+               error("could not find qgroup status item");
                if (ret > 0)
                        ret = -ENOENT;
                goto out;
@@ -1575,7 +1575,7 @@ out:
 
 int repair_qgroups(struct btrfs_fs_info *info, int *repaired)
 {
-       int ret;
+       int ret = 0;
        struct qgroup_count *count, *tmpcount;
 
        *repaired = 0;