diff options
| author | Geert Uytterhoeven <geert@linux-m68k.org> | 2013-08-20 07:20:15 -0400 |
|---|---|---|
| committer | Chris Mason <chris.mason@fusionio.com> | 2013-09-01 08:16:16 -0400 |
| commit | b308bc2f05a86e728bd035e21a4974acd05f4d1e (patch) | |
| tree | 507644cc1836ade17d45cd1640c33f1db74088a2 /fs/btrfs/ctree.h | |
| parent | fba6aa75654394fccf2530041e9451414c28084f (diff) | |
Btrfs: 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.
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Josef Bacik <jbacik@fusionio.com>
Signed-off-by: Chris Mason <chris.mason@fusionio.com>
Diffstat (limited to 'fs/btrfs/ctree.h')
| -rw-r--r-- | fs/btrfs/ctree.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h index 1b8f5def29c7..c90be01cbe67 100644 --- a/fs/btrfs/ctree.h +++ b/fs/btrfs/ctree.h | |||
| @@ -2680,10 +2680,9 @@ static inline unsigned long btrfs_header_fsid(struct extent_buffer *eb) | |||
| 2680 | return offsetof(struct btrfs_header, fsid); | 2680 | return offsetof(struct btrfs_header, fsid); |
| 2681 | } | 2681 | } |
| 2682 | 2682 | ||
| 2683 | static inline u8 *btrfs_header_chunk_tree_uuid(struct extent_buffer *eb) | 2683 | static inline unsigned long btrfs_header_chunk_tree_uuid(struct extent_buffer *eb) |
| 2684 | { | 2684 | { |
| 2685 | unsigned long ptr = offsetof(struct btrfs_header, chunk_tree_uuid); | 2685 | return offsetof(struct btrfs_header, chunk_tree_uuid); |
| 2686 | return (u8 *)ptr; | ||
| 2687 | } | 2686 | } |
| 2688 | 2687 | ||
| 2689 | static inline int btrfs_is_leaf(struct extent_buffer *eb) | 2688 | static inline int btrfs_is_leaf(struct extent_buffer *eb) |