diff options
| author | Ross Kirk <ross.kirk@gmail.com> | 2013-10-01 11:59:22 +0200 |
|---|---|---|
| committer | Chris Mason <chris.mason@fusionio.com> | 2013-10-16 08:23:11 -0400 |
| commit | 33ce9a82b89486efc85c938caac968f5ee0408e1 (patch) | |
| tree | 522b49dedb9d8638079fce98ac9fbd7739dbf31c /chunk-recover.c | |
| parent | 120e27d76fb5748db1160baf1efe0ceef59452f0 (diff) | |
| download | btrfs-progs-33ce9a82b89486efc85c938caac968f5ee0408e1.tar.gz | |
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 <ross.kirk@gmail.com>
Signed-off-by: David Sterba <dsterba@suse.cz>
Signed-off-by: Chris Mason <chris.mason@fusionio.com>
Diffstat (limited to 'chunk-recover.c')
| -rw-r--r-- | chunk-recover.c | 5 |
1 files changed, 2 insertions, 3 deletions
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), |