diff options
| author | Wang Shilong <wangsl.fnst@cn.fujitsu.com> | 2014-05-28 19:20:41 +0800 |
|---|---|---|
| committer | David Sterba <dsterba@suse.cz> | 2014-08-22 14:39:33 +0200 |
| commit | a764785990db3a68c09d1d5cfcfc49b5b6028179 (patch) | |
| tree | 76de9a952328ccc927f8c101f40d2facc6b5a4ac /btrfs-calc-size.c | |
| parent | c63d47653fc61e59f6b7d30b55982e9fe843ceef (diff) | |
| download | btrfs-progs-a764785990db3a68c09d1d5cfcfc49b5b6028179.tar.gz | |
Btrfs-progs: fsck: fix wrong check for btrfs_read_fs_root()
When encountering a corrupted fs root node, fsck hit following message:
Check tree block failed, want=29360128, have=0
Check tree block failed, want=29360128, have=0
Check tree block failed, want=29360128, have=0
Check tree block failed, want=29360128, have=0
Check tree block failed, want=29360128, have=0
read block failed check_tree_block
Checking filesystem on /dev/sda9
UUID: 0d295d80-bae2-45f2-a106-120dbfd0e173
checking extents
Segmentation fault (core dumped)
This is because in btrfs_setup_all_roots(), we check
btrfs_read_fs_root() return value by verifing whether it is
NULL pointer, this is wrong since btrfs_read_fs_root() return
PTR_ERR(ret), fix it.
Signed-off-by: Wang Shilong <wangsl.fnst@cn.fujitsu.com>
Signed-off-by: David Sterba <dsterba@suse.cz>
Diffstat (limited to 'btrfs-calc-size.c')
| -rw-r--r-- | btrfs-calc-size.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/btrfs-calc-size.c b/btrfs-calc-size.c index a832ee0..5eabdfc 100644 --- a/btrfs-calc-size.c +++ b/btrfs-calc-size.c @@ -326,7 +326,7 @@ static int calc_root_size(struct btrfs_root *tree_root, struct btrfs_key *key, int size_fail = 0; root = btrfs_read_fs_root(tree_root->fs_info, key); - if (!root) { + if (IS_ERR(root)) { fprintf(stderr, "Failed to read root %Lu\n", key->objectid); return 1; } |