From 7ff512ce38a266756442ddca328090fe9b6781dc Mon Sep 17 00:00:00 2001 From: Ross Kirk Date: Wed, 2 Oct 2013 13:28:27 +0100 Subject: btrfs-progs: Make btrfs_header_chunk_tree_uuid() return unsigned long Internally, btrfs_header_chunk_tree_uuid() calculates an unsigned long, but casts it to a pointer, while all callers cast it to unsigned long again. From btrfs commit b308bc2f05a86e728bd035e21a4974acd05f4d1e Signed-off-by: Ross Kirk Signed-off-by: David Sterba Signed-off-by: Chris Mason --- ctree.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'ctree.c') diff --git a/ctree.c b/ctree.c index fdb1bcbf..2d4f773b 100644 --- a/ctree.c +++ b/ctree.c @@ -1344,7 +1344,7 @@ static int noinline insert_new_root(struct btrfs_trans_handle *trans, btrfs_header_fsid(), BTRFS_FSID_SIZE); write_extent_buffer(c, root->fs_info->chunk_tree_uuid, - (unsigned long)btrfs_header_chunk_tree_uuid(c), + btrfs_header_chunk_tree_uuid(c), BTRFS_UUID_SIZE); btrfs_set_node_key(c, &lower_key, 0); @@ -1463,7 +1463,7 @@ static int split_node(struct btrfs_trans_handle *trans, struct btrfs_root write_extent_buffer(split, root->fs_info->fsid, btrfs_header_fsid(), BTRFS_FSID_SIZE); write_extent_buffer(split, root->fs_info->chunk_tree_uuid, - (unsigned long)btrfs_header_chunk_tree_uuid(split), + btrfs_header_chunk_tree_uuid(split), BTRFS_UUID_SIZE); @@ -2024,7 +2024,7 @@ again: btrfs_header_fsid(), BTRFS_FSID_SIZE); write_extent_buffer(right, root->fs_info->chunk_tree_uuid, - (unsigned long)btrfs_header_chunk_tree_uuid(right), + btrfs_header_chunk_tree_uuid(right), BTRFS_UUID_SIZE); if (split == 0) { -- cgit v1.2.3