summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorJan Schmidt <list.btrfs@jan-o-sch.net>2012-02-08 16:01:01 +0100
committerDavid Sterba <dsterba@suse.cz>2012-02-15 16:40:23 +0100
commit8f24b49688281a77e8331894ed407f0cfe732303 (patch)
tree22d5c69f57713ee25a4a3e38404d675c488a91cf /fs
parent941b2ddf71987ef369389517a7e215dd505fe01e (diff)
downloadblackbird-op-linux-8f24b49688281a77e8331894ed407f0cfe732303.tar.gz
blackbird-op-linux-8f24b49688281a77e8331894ed407f0cfe732303.zip
Btrfs: avoid positive number with ERR_PTR
inode_ref_info() returns 1 when the element wasn't found and < 0 on error, just like btrfs_search_slot(). In iref_to_path() it's an error when the inode ref can't be found, thus we return ERR_PTR(ret) in that case. In order to avoid ERR_PTR(1), we now set ret to -ENOENT in that case. Signed-off-by: Jan Schmidt <list.btrfs@jan-o-sch.net>
Diffstat (limited to 'fs')
-rw-r--r--fs/btrfs/backref.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/btrfs/backref.c b/fs/btrfs/backref.c
index 633c701a287d..98f6bf10bbd4 100644
--- a/fs/btrfs/backref.c
+++ b/fs/btrfs/backref.c
@@ -892,6 +892,8 @@ static char *iref_to_path(struct btrfs_root *fs_root, struct btrfs_path *path,
if (eb != eb_in)
free_extent_buffer(eb);
ret = inode_ref_info(parent, 0, fs_root, path, &found_key);
+ if (ret > 0)
+ ret = -ENOENT;
if (ret)
break;
next_inum = found_key.offset;
OpenPOWER on IntegriCloud