Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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: 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 fba6aa75

fs/btrfs/ctree.c

+3 −4
Original line number Diff line number Diff line
@@ -3111,8 +3111,7 @@ static noinline int insert_new_root(struct btrfs_trans_handle *trans, 
			    BTRFS_FSID_SIZE);



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

			    (unsigned long)btrfs_header_chunk_tree_uuid(c),

			    BTRFS_UUID_SIZE);

			    btrfs_header_chunk_tree_uuid(c), BTRFS_UUID_SIZE);



	btrfs_set_node_key(c, &lower_key, 0);

	btrfs_set_node_blockptr(c, 0, lower->start);
@@ -3249,7 +3248,7 @@ static noinline int split_node(struct btrfs_trans_handle *trans, 
	write_extent_buffer(split, root->fs_info->fsid,

			    btrfs_header_fsid(split), BTRFS_FSID_SIZE);

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

			    (unsigned long)btrfs_header_chunk_tree_uuid(split),

			    btrfs_header_chunk_tree_uuid(split),

			    BTRFS_UUID_SIZE);



	tree_mod_log_eb_copy(root->fs_info, split, c, 0, mid, c_nritems - mid);
@@ -4005,7 +4004,7 @@ static noinline int split_leaf(struct btrfs_trans_handle *trans, 
			    btrfs_header_fsid(right), BTRFS_FSID_SIZE);



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

			    (unsigned long)btrfs_header_chunk_tree_uuid(right),

			    btrfs_header_chunk_tree_uuid(right),

			    BTRFS_UUID_SIZE);



	if (split == 0) {

fs/btrfs/ctree.h

+2 −3
Original line number Diff line number Diff line
@@ -2680,10 +2680,9 @@ static inline unsigned long btrfs_header_fsid(struct extent_buffer *eb) 
	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 int btrfs_is_leaf(struct extent_buffer *eb)

fs/btrfs/disk-io.c

+2 −3
Original line number Diff line number Diff line
@@ -1294,7 +1294,7 @@ struct btrfs_root *btrfs_create_tree(struct btrfs_trans_handle *trans, 
	write_extent_buffer(leaf, fs_info->fsid, btrfs_header_fsid(leaf),

			    BTRFS_FSID_SIZE);

	write_extent_buffer(leaf, fs_info->chunk_tree_uuid,

			    (unsigned long)btrfs_header_chunk_tree_uuid(leaf),

			    btrfs_header_chunk_tree_uuid(leaf),

			    BTRFS_UUID_SIZE);

	btrfs_mark_buffer_dirty(leaf);
@@ -2629,8 +2629,7 @@ int open_ctree(struct super_block *sb, 
	chunk_root->commit_root = btrfs_root_node(chunk_root);



	read_extent_buffer(chunk_root->node, fs_info->chunk_tree_uuid,

	   (unsigned long)btrfs_header_chunk_tree_uuid(chunk_root->node),

	   BTRFS_UUID_SIZE);

	   btrfs_header_chunk_tree_uuid(chunk_root->node), BTRFS_UUID_SIZE);



	ret = btrfs_read_chunk_tree(chunk_root);

	if (ret) {

fs/btrfs/ioctl.c

+1 −1
Original line number Diff line number Diff line
@@ -439,7 +439,7 @@ static noinline int create_subvol(struct inode *dir, 
	write_extent_buffer(leaf, root->fs_info->fsid, btrfs_header_fsid(leaf),

			    BTRFS_FSID_SIZE);

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

			    (unsigned long)btrfs_header_chunk_tree_uuid(leaf),

			    btrfs_header_chunk_tree_uuid(leaf),

			    BTRFS_UUID_SIZE);

	btrfs_mark_buffer_dirty(leaf);