Btrfs: Make btrfs_header_fsid() return unsigned long

Internally, btrfs_header_fsid() calculates an unsigned long, but casts
it to a pointer, while all callers cast it to unsigned long again.

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Josef Bacik <jbacik@fusionio.com>
Signed-off-by: Chris Mason <chris.mason@fusionio.com>

1 files changed, 5 insertions, 10 deletions

diff --git a/fs/btrfs/ctree.c b/fs/btrfs/ctree.c
index 1d94242ec002..8e3efe3bad24 100644
--- a/fs/btrfs/ctree.c
+++ b/fs/btrfs/ctree.c
@@ -274,8 +274,7 @@ int btrfs_copy_root(struct btrfs_trans_handle *trans,
         else
                 btrfs_set_header_owner(cow, new_root_objectid);
 
-        write_extent_buffer(cow, root->fs_info->fsid,
-                            (unsigned long)btrfs_header_fsid(cow),
+        write_extent_buffer(cow, root->fs_info->fsid, btrfs_header_fsid(cow),
                             BTRFS_FSID_SIZE);
 
         WARN_ON(btrfs_header_generation(buf) > trans->transid);
@@ -997,8 +996,7 @@ static noinline int __btrfs_cow_block(struct btrfs_trans_handle *trans,
         else
                 btrfs_set_header_owner(cow, root->root_key.objectid);
 
-        write_extent_buffer(cow, root->fs_info->fsid,
-                            (unsigned long)btrfs_header_fsid(cow),
+        write_extent_buffer(cow, root->fs_info->fsid, btrfs_header_fsid(cow),
                             BTRFS_FSID_SIZE);
 
         ret = update_ref_for_cow(trans, root, buf, cow, &last_ref);
@@ -3109,8 +3107,7 @@ static noinline int insert_new_root(struct btrfs_trans_handle *trans,
         btrfs_set_header_backref_rev(c, BTRFS_MIXED_BACKREF_REV);
         btrfs_set_header_owner(c, root->root_key.objectid);
 
-        write_extent_buffer(c, root->fs_info->fsid,
-                            (unsigned long)btrfs_header_fsid(c),
+        write_extent_buffer(c, root->fs_info->fsid, btrfs_header_fsid(c),
                             BTRFS_FSID_SIZE);
 
         write_extent_buffer(c, root->fs_info->chunk_tree_uuid,
@@ -3250,8 +3247,7 @@ static noinline int split_node(struct btrfs_trans_handle *trans,
         btrfs_set_header_backref_rev(split, BTRFS_MIXED_BACKREF_REV);
         btrfs_set_header_owner(split, root->root_key.objectid);
         write_extent_buffer(split, root->fs_info->fsid,
-                            (unsigned long)btrfs_header_fsid(split),
-                            BTRFS_FSID_SIZE);
+                            btrfs_header_fsid(split), BTRFS_FSID_SIZE);
         write_extent_buffer(split, root->fs_info->chunk_tree_uuid,
                             (unsigned long)btrfs_header_chunk_tree_uuid(split),
                             BTRFS_UUID_SIZE);
@@ -4006,8 +4002,7 @@ again:
         btrfs_set_header_owner(right, root->root_key.objectid);
         btrfs_set_header_level(right, 0);
         write_extent_buffer(right, root->fs_info->fsid,
-                            (unsigned long)btrfs_header_fsid(right),
-                            BTRFS_FSID_SIZE);
+                            btrfs_header_fsid(right), BTRFS_FSID_SIZE);
 
         write_extent_buffer(right, root->fs_info->chunk_tree_uuid,
                             (unsigned long)btrfs_header_chunk_tree_uuid(right),