UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Geert Uytterhoeven 2013-08-20 13:20:15 +02:00 committed by Chris Mason
parent fba6aa7565
commit b308bc2f05
4 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
fs/btrfs/ctree.c
View File

@ -3111,8 +3111,7 @@ static noinline int insert_new_root(struct btrfs_trans_handle *trans,
BTRFS_FSID_SIZE); BTRFS_FSID_SIZE);
write_extent_buffer(c, root->fs_info->chunk_tree_uuid, write_extent_buffer(c, root->fs_info->chunk_tree_uuid,
(unsigned long)btrfs_header_chunk_tree_uuid(c), btrfs_header_chunk_tree_uuid(c), BTRFS_UUID_SIZE);
BTRFS_UUID_SIZE);
btrfs_set_node_key(c, &lower_key, 0); btrfs_set_node_key(c, &lower_key, 0);
btrfs_set_node_blockptr(c, 0, lower->start); 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, write_extent_buffer(split, root->fs_info->fsid,
btrfs_header_fsid(split), BTRFS_FSID_SIZE); btrfs_header_fsid(split), BTRFS_FSID_SIZE);
write_extent_buffer(split, root->fs_info->chunk_tree_uuid, 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); BTRFS_UUID_SIZE);
tree_mod_log_eb_copy(root->fs_info, split, c, 0, mid, c_nritems - mid); tree_mod_log_eb_copy(root->fs_info, split, c, 0, mid, c_nritems - mid);
@ -4005,7 +4004,7 @@ again:
btrfs_header_fsid(right), BTRFS_FSID_SIZE); btrfs_header_fsid(right), BTRFS_FSID_SIZE);
write_extent_buffer(right, root->fs_info->chunk_tree_uuid, 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); BTRFS_UUID_SIZE);
if (split == 0) { if (split == 0) {

5
fs/btrfs/ctree.h
View File

@ -2680,10 +2680,9 @@ static inline unsigned long btrfs_header_fsid(struct extent_buffer *eb)
return offsetof(struct btrfs_header, fsid); 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 offsetof(struct btrfs_header, chunk_tree_uuid);
return (u8 *)ptr;
} }
static inline int btrfs_is_leaf(struct extent_buffer *eb) static inline int btrfs_is_leaf(struct extent_buffer *eb)

5
fs/btrfs/disk-io.c
View File

@ -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), write_extent_buffer(leaf, fs_info->fsid, btrfs_header_fsid(leaf),
BTRFS_FSID_SIZE); BTRFS_FSID_SIZE);
write_extent_buffer(leaf, fs_info->chunk_tree_uuid, 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_UUID_SIZE);
btrfs_mark_buffer_dirty(leaf); 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); chunk_root->commit_root = btrfs_root_node(chunk_root);
read_extent_buffer(chunk_root->node, fs_info->chunk_tree_uuid, read_extent_buffer(chunk_root->node, fs_info->chunk_tree_uuid,
(unsigned long)btrfs_header_chunk_tree_uuid(chunk_root->node), btrfs_header_chunk_tree_uuid(chunk_root->node), BTRFS_UUID_SIZE);
BTRFS_UUID_SIZE);
ret = btrfs_read_chunk_tree(chunk_root); ret = btrfs_read_chunk_tree(chunk_root);
if (ret) { if (ret) {

2
fs/btrfs/ioctl.c
View File

@ -439,7 +439,7 @@ static noinline int create_subvol(struct inode *dir,
write_extent_buffer(leaf, root->fs_info->fsid, btrfs_header_fsid(leaf), write_extent_buffer(leaf, root->fs_info->fsid, btrfs_header_fsid(leaf),
BTRFS_FSID_SIZE); BTRFS_FSID_SIZE);
write_extent_buffer(leaf, root->fs_info->chunk_tree_uuid, 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_UUID_SIZE);
btrfs_mark_buffer_dirty(leaf); btrfs_mark_buffer_dirty(leaf);