Btrfs-progs: make extent_ref_type() match kernelspace

extent_ref_type() contains inconsequential differences between
kernelspace and userspace, and has since the initial commits
to each.  Just make userspace look like kernelspace.

Signed-off-by: Eric Sandeen <sandeen@redhat.com>
Signed-off-by: David Sterba <dsterba@suse.cz>
Signed-off-by: Chris Mason <chris.mason@fusionio.com>

diff --git a/extent-tree.c b/extent-tree.c
index e458268..e488390 100644 (file)
--- a/extent-tree.c
+++ b/extent-tree.c
@@ -954,17 +954,19 @@ static noinline int insert_tree_block_ref(struct btrfs_trans_handle *trans,
 
 static inline int extent_ref_type(u64 parent, u64 owner)
 {
+       int type;
        if (owner < BTRFS_FIRST_FREE_OBJECTID) {
                if (parent > 0)
-                       return BTRFS_SHARED_BLOCK_REF_KEY;
+                       type = BTRFS_SHARED_BLOCK_REF_KEY;
                else
-                       return BTRFS_TREE_BLOCK_REF_KEY;
+                       type = BTRFS_TREE_BLOCK_REF_KEY;
        } else {
                if (parent > 0)
-                       return BTRFS_SHARED_DATA_REF_KEY;
+                       type = BTRFS_SHARED_DATA_REF_KEY;
                else
-                       return BTRFS_EXTENT_DATA_REF_KEY;
+                       type = BTRFS_EXTENT_DATA_REF_KEY;
        }
+       return type;
 }
 
 static int find_next_key(struct btrfs_path *path, struct btrfs_key *key)