diff options
| author | Ross Kirk <ross.kirk@gmail.com> | 2013-10-02 13:28:27 +0100 |
|---|---|---|
| committer | Chris Mason <clm@fb.com> | 2014-01-31 08:22:04 -0800 |
| commit | 7ff512ce38a266756442ddca328090fe9b6781dc (patch) | |
| tree | 2834e555523e45037322e4ff300e4562be4d6a43 /ctree.h | |
| parent | 1ecefced86538306d581b05105a93d1268ce0028 (diff) | |
btrfs-progs: Make btrfs_header_chunk_tree_uuid() return unsigned long
Internally, btrfs_header_chunk_tree_uuid() calculates an unsigned
long, but casts it to a pointer, while all callers cast it to unsigned
long again.
From btrfs commit b308bc2f05a86e728bd035e21a4974acd05f4d1e
Signed-off-by: Ross Kirk <ross.kirk@gmail.com>
Signed-off-by: David Sterba <dsterba@suse.cz>
Signed-off-by: Chris Mason <clm@fb.com>
Diffstat (limited to 'ctree.h')
| -rw-r--r-- | ctree.h | 5 |
1 files changed, 2 insertions, 3 deletions
@@ -1794,10 +1794,9 @@ static inline unsigned long btrfs_header_fsid(void) return offsetof(struct btrfs_header, fsid); } -static inline u8 *btrfs_header_chunk_tree_uuid(struct extent_buffer *eb) +static inline unsigned long btrfs_header_chunk_tree_uuid(struct extent_buffer *eb) { - unsigned long ptr = offsetof(struct btrfs_header, chunk_tree_uuid); - return (u8 *)ptr; + return offsetof(struct btrfs_header, chunk_tree_uuid); } static inline u8 *btrfs_super_fsid(struct extent_buffer *eb) |