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 /utils.c | |
| parent | 120e27d76fb5748db1160baf1efe0ceef59452f0 (diff) | |
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 'utils.c')
| -rw-r--r-- | utils.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -136,8 +136,8 @@ int make_btrfs(int fd, const char *device, const char *label, btrfs_set_header_generation(buf, 1); btrfs_set_header_backref_rev(buf, BTRFS_MIXED_BACKREF_REV); btrfs_set_header_owner(buf, BTRFS_ROOT_TREE_OBJECTID); - write_extent_buffer(buf, super.fsid, (unsigned long) - btrfs_header_fsid(), BTRFS_FSID_SIZE); + write_extent_buffer(buf, super.fsid, btrfs_header_fsid(), + BTRFS_FSID_SIZE); write_extent_buffer(buf, chunk_tree_uuid, (unsigned long) btrfs_header_chunk_tree_uuid(buf), |