diff options
| -rw-r--r-- | btrfs-find-root.c | 3 | ||||
| -rw-r--r-- | chunk-recover.c | 4 | ||||
| -rw-r--r-- | cmds-check.c | 2 | ||||
| -rw-r--r-- | ctree.c | 6 | ||||
| -rw-r--r-- | ctree.h | 5 | ||||
| -rw-r--r-- | disk-io.c | 2 | ||||
| -rw-r--r-- | print-tree.c | 2 | ||||
| -rw-r--r-- | utils.c | 2 |
8 files changed, 12 insertions, 14 deletions
diff --git a/btrfs-find-root.c b/btrfs-find-root.c index 7572f520..0ba4c575 100644 --- a/btrfs-find-root.c +++ b/btrfs-find-root.c @@ -112,8 +112,7 @@ static struct btrfs_root *open_ctree_broken(int fd, const char *device) eb = fs_info->chunk_root->node; read_extent_buffer(eb, fs_info->chunk_tree_uuid, - (unsigned long)btrfs_header_chunk_tree_uuid(eb), - BTRFS_UUID_SIZE); + btrfs_header_chunk_tree_uuid(eb), BTRFS_UUID_SIZE); return fs_info->chunk_root; out_chunk: diff --git a/chunk-recover.c b/chunk-recover.c index bcde39e2..44e8b833 100644 --- a/chunk-recover.c +++ b/chunk-recover.c @@ -1047,7 +1047,7 @@ static int __rebuild_chunk_root(struct btrfs_trans_handle *trans, btrfs_header_fsid(), BTRFS_FSID_SIZE); write_extent_buffer(cow, root->fs_info->chunk_tree_uuid, - (unsigned long)btrfs_header_chunk_tree_uuid(cow), + btrfs_header_chunk_tree_uuid(cow), BTRFS_UUID_SIZE); root->node = cow; @@ -1235,7 +1235,7 @@ open_ctree_with_broken_chunk(struct recover_control *rc) eb = fs_info->tree_root->node; read_extent_buffer(eb, fs_info->chunk_tree_uuid, - (unsigned long)btrfs_header_chunk_tree_uuid(eb), + btrfs_header_chunk_tree_uuid(eb), BTRFS_UUID_SIZE); return fs_info->fs_root; diff --git a/cmds-check.c b/cmds-check.c index 43729a88..c15d8d03 100644 --- a/cmds-check.c +++ b/cmds-check.c @@ -5697,7 +5697,7 @@ init: btrfs_header_fsid(), BTRFS_FSID_SIZE); 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_mark_buffer_dirty(c); @@ -1344,7 +1344,7 @@ static int noinline insert_new_root(struct btrfs_trans_handle *trans, btrfs_header_fsid(), BTRFS_FSID_SIZE); 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_set_node_key(c, &lower_key, 0); @@ -1463,7 +1463,7 @@ static int split_node(struct btrfs_trans_handle *trans, struct btrfs_root write_extent_buffer(split, root->fs_info->fsid, btrfs_header_fsid(), 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); @@ -2024,7 +2024,7 @@ again: btrfs_header_fsid(), 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) { @@ -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) @@ -1108,7 +1108,7 @@ static struct btrfs_fs_info *__open_ctree_fd(int fp, const char *path, eb = fs_info->chunk_root->node; read_extent_buffer(eb, fs_info->chunk_tree_uuid, - (unsigned long)btrfs_header_chunk_tree_uuid(eb), + btrfs_header_chunk_tree_uuid(eb), BTRFS_UUID_SIZE); ret = btrfs_setup_all_roots(fs_info, root_tree_bytenr, flags); diff --git a/print-tree.c b/print-tree.c index c52e5da0..716f4d37 100644 --- a/print-tree.c +++ b/print-tree.c @@ -199,7 +199,7 @@ static void print_uuids(struct extent_buffer *eb) uuid_unparse(disk_uuid, fs_uuid); read_extent_buffer(eb, disk_uuid, - (unsigned long)btrfs_header_chunk_tree_uuid(eb), + btrfs_header_chunk_tree_uuid(eb), BTRFS_UUID_SIZE); chunk_uuid[BTRFS_UUID_UNPARSED_SIZE - 1] = '\0'; @@ -139,7 +139,7 @@ int make_btrfs(int fd, const char *device, const char *label, write_extent_buffer(buf, super.fsid, btrfs_header_fsid(), BTRFS_FSID_SIZE); - write_extent_buffer(buf, chunk_tree_uuid, (unsigned long) + write_extent_buffer(buf, chunk_tree_uuid, btrfs_header_chunk_tree_uuid(buf), BTRFS_UUID_SIZE); |