diff --git a/[refs] b/[refs] index 21f819bd542e..49f7cc328200 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: eb838e73dc2121d2bae47d5678952cd7d48793b5 +refs/heads/master: 3627bf4503b504077332c13496cb1bd54713bcbb diff --git a/trunk/fs/btrfs/backref.c b/trunk/fs/btrfs/backref.c index a256f3b2a845..ff6475f409d6 100644 --- a/trunk/fs/btrfs/backref.c +++ b/trunk/fs/btrfs/backref.c @@ -1438,10 +1438,10 @@ int iterate_inodes_from_logical(u64 logical, struct btrfs_fs_info *fs_info, ret = extent_from_logical(fs_info, logical, path, &found_key); btrfs_release_path(path); - if (ret & BTRFS_EXTENT_FLAG_TREE_BLOCK) - ret = -EINVAL; if (ret < 0) return ret; + if (ret & BTRFS_EXTENT_FLAG_TREE_BLOCK) + return -EINVAL; extent_item_pos = logical - found_key.objectid; ret = iterate_extent_inodes(fs_info, found_key.objectid,