From 33ce9a82b89486efc85c938caac968f5ee0408e1 Mon Sep 17 00:00:00 2001 From: Ross Kirk Date: Tue, 1 Oct 2013 11:59:22 +0200 Subject: btrfs-progs: 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. Committed to btrfs as fba6aa75654394fccf2530041e9451414c28084f Fix line length issues and match changes to kernelspace Signed-off-by: Ross Kirk Signed-off-by: David Sterba Signed-off-by: Chris Mason --- chunk-recover.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'chunk-recover.c') diff --git a/chunk-recover.c b/chunk-recover.c index 6c6db11..bcde39e 100644 --- a/chunk-recover.c +++ b/chunk-recover.c @@ -743,7 +743,7 @@ static int scan_one_device(struct recover_control *rc, int fd, break; if (memcmp_extent_buffer(buf, rc->fs_devices->fsid, - (unsigned long)btrfs_header_fsid(), + btrfs_header_fsid(), BTRFS_FSID_SIZE)) { bytenr += rc->sectorsize; continue; @@ -1044,8 +1044,7 @@ static int __rebuild_chunk_root(struct btrfs_trans_handle *trans, btrfs_set_header_backref_rev(cow, BTRFS_MIXED_BACKREF_REV); btrfs_set_header_owner(cow, BTRFS_CHUNK_TREE_OBJECTID); write_extent_buffer(cow, root->fs_info->fsid, - (unsigned long)btrfs_header_fsid(), - BTRFS_FSID_SIZE); + btrfs_header_fsid(), BTRFS_FSID_SIZE); write_extent_buffer(cow, root->fs_info->chunk_tree_uuid, (unsigned long)btrfs_header_chunk_tree_uuid(cow), -- cgit v1.2.1