Commit 231e88f4 authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Chris Mason
Browse files

Btrfs: Make btrfs_dev_extent_chunk_tree_uuid() return unsigned long 



Internally, btrfs_dev_extent_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: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: default avatarJosef Bacik <jbacik@fusionio.com>
Signed-off-by: default avatarChris Mason <chris.mason@fusionio.com>
parent 1473b24e

fs/btrfs/ctree.h

+2 −2
Original line number Diff line number Diff line
@@ -2330,10 +2330,10 @@ BTRFS_SETGET_FUNCS(dev_extent_chunk_offset, struct btrfs_dev_extent, 
		   chunk_offset, 64);

BTRFS_SETGET_FUNCS(dev_extent_length, struct btrfs_dev_extent, length, 64);



static inline u8 *btrfs_dev_extent_chunk_tree_uuid(struct btrfs_dev_extent *dev)

static inline unsigned long btrfs_dev_extent_chunk_tree_uuid(struct btrfs_dev_extent *dev)

{

	unsigned long ptr = offsetof(struct btrfs_dev_extent, chunk_tree_uuid);

	return (u8 *)((unsigned long)dev + ptr);

	return (unsigned long)dev + ptr;

}



BTRFS_SETGET_FUNCS(extent_refs, struct btrfs_extent_item, refs, 64);

fs/btrfs/volumes.c

+1 −2
Original line number Diff line number Diff line
@@ -1311,8 +1311,7 @@ static int btrfs_alloc_dev_extent(struct btrfs_trans_handle *trans, 
	btrfs_set_dev_extent_chunk_offset(leaf, extent, chunk_offset);



	write_extent_buffer(leaf, root->fs_info->chunk_tree_uuid,

		    (unsigned long)btrfs_dev_extent_chunk_tree_uuid(extent),

		    BTRFS_UUID_SIZE);

		    btrfs_dev_extent_chunk_tree_uuid(extent), BTRFS_UUID_SIZE);



	btrfs_set_dev_extent_length(leaf, extent, num_bytes);

	btrfs_mark_buffer_dirty(leaf);

CRA Git | Maintained and supported by SUSTech CRA and CCSE