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 /ctree.h | |
| 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 'ctree.h')
| -rw-r--r-- | ctree.h | 5 |
1 files changed, 2 insertions, 3 deletions
@@ -1777,10 +1777,9 @@ static inline void btrfs_set_header_backref_rev(struct extent_buffer *eb, btrfs_set_header_flags(eb, flags); } -static inline u8 *btrfs_header_fsid(void) +static inline unsigned long btrfs_header_fsid(void) { - unsigned long ptr = offsetof(struct btrfs_header, fsid); - return (u8 *)ptr; + return offsetof(struct btrfs_header, fsid); } static inline u8 *btrfs_header_chunk_tree_uuid(struct extent_buffer *eb) |