aboutsummaryrefslogtreecommitdiffstats
path: root/fs/btrfs/volumes.c
diff options
context:
space:
mode:
authorGeert Uytterhoeven <geert@linux-m68k.org>2013-08-20 07:20:13 -0400
committerChris Mason <chris.mason@fusionio.com>2013-09-01 08:16:14 -0400
commit231e88f41027d90e9516d257d8085069b65686dd (patch)
treeeb05e07a572ca421b1b41d1539095940972465d7 /fs/btrfs/volumes.c
parent1473b24ee0cb43d4b48aa0c5f1b8417928910a4d (diff)
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: 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/volumes.c')
-rw-r--r--fs/btrfs/volumes.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c
index 8b8c4397165c..34068b887f14 100644
--- a/fs/btrfs/volumes.c
+++ b/fs/btrfs/volumes.c
@@ -1311,8 +1311,7 @@ static int btrfs_alloc_dev_extent(struct btrfs_trans_handle *trans,
1311 btrfs_set_dev_extent_chunk_offset(leaf, extent, chunk_offset); 1311 btrfs_set_dev_extent_chunk_offset(leaf, extent, chunk_offset);
1312 1312
1313 write_extent_buffer(leaf, root->fs_info->chunk_tree_uuid, 1313 write_extent_buffer(leaf, root->fs_info->chunk_tree_uuid,
1314 (unsigned long)btrfs_dev_extent_chunk_tree_uuid(extent), 1314 btrfs_dev_extent_chunk_tree_uuid(extent), BTRFS_UUID_SIZE);
1315 BTRFS_UUID_SIZE);
1316 1315
1317 btrfs_set_dev_extent_length(leaf, extent, num_bytes); 1316 btrfs_set_dev_extent_length(leaf, extent, num_bytes);
1318 btrfs_mark_buffer_dirty(leaf); 1317 btrfs_mark_buffer_dirty(leaf);