diff options
| author | Liu Bo <bo.li.liu@oracle.com> | 2015-05-25 17:30:15 +0800 |
|---|---|---|
| committer | Chris Mason <clm@fb.com> | 2015-06-03 04:03:08 -0700 |
| commit | 64c043de466d5746e7ca306dab9d418cd871cefc (patch) | |
| tree | fcce36cbfdc022f24b5b847152d6b17c967a1b64 /fs/btrfs/backref.c | |
| parent | 8635eda91ee11690bd8f73b2504ee19431fd6380 (diff) | |
| download | linux-stable-64c043de466d5746e7ca306dab9d418cd871cefc.tar.gz linux-stable-64c043de466d5746e7ca306dab9d418cd871cefc.tar.bz2 linux-stable-64c043de466d5746e7ca306dab9d418cd871cefc.zip | |
Btrfs: fix up read_tree_block to return proper error
The return value of read_tree_block() can confuse callers as it always
returns NULL for either -ENOMEM or -EIO, so it's likely that callers
parse it to a wrong error, for instance, in btrfs_read_tree_root().
This fixes the above issue.
Signed-off-by: Liu Bo <bo.li.liu@oracle.com>
Reviewed-by: David Sterba <dsterba@suse.cz>
Signed-off-by: Chris Mason <clm@fb.com>
Diffstat (limited to 'fs/btrfs/backref.c')
| -rw-r--r-- | fs/btrfs/backref.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/fs/btrfs/backref.c b/fs/btrfs/backref.c index 614aaa1969bd..679dc97354be 100644 --- a/fs/btrfs/backref.c +++ b/fs/btrfs/backref.c @@ -491,7 +491,9 @@ static int __add_missing_keys(struct btrfs_fs_info *fs_info, BUG_ON(!ref->wanted_disk_byte); eb = read_tree_block(fs_info->tree_root, ref->wanted_disk_byte, 0); - if (!eb || !extent_buffer_uptodate(eb)) { + if (IS_ERR(eb)) { + return PTR_ERR(eb); + } else if (!extent_buffer_uptodate(eb)) { free_extent_buffer(eb); return -EIO; } @@ -1034,7 +1036,10 @@ again: eb = read_tree_block(fs_info->extent_root, ref->parent, 0); - if (!eb || !extent_buffer_uptodate(eb)) { + if (IS_ERR(eb)) { + ret = PTR_ERR(eb); + goto out; + } else if (!extent_buffer_uptodate(eb)) { free_extent_buffer(eb); ret = -EIO; goto out; |