diff options
author | Jan Schmidt <list.btrfs@jan-o-sch.net> | 2012-08-13 04:52:38 -0400 |
---|---|---|
committer | Chris Mason <chris.mason@fusionio.com> | 2012-10-01 15:19:01 -0400 |
commit | 995e01b7af745b8aaa5e882cfb7bfd5baab3f335 (patch) | |
tree | dc1cea9734e2b635edc7b2949abdd720cbc60e22 /fs/btrfs/send.c | |
parent | 74dd17fbe3d65829e75d84f00a9525b2ace93998 (diff) |
Btrfs: fix gcc warnings for 32bit compiles
Signed-off-by: Jan Schmidt <list.btrfs@jan-o-sch.net>
Signed-off-by: Chris Mason <chris.mason@fusionio.com>
Diffstat (limited to 'fs/btrfs/send.c')
-rw-r--r-- | fs/btrfs/send.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/btrfs/send.c b/fs/btrfs/send.c index f22fdd41ff49..e5c867996aa0 100644 --- a/fs/btrfs/send.c +++ b/fs/btrfs/send.c | |||
@@ -1035,7 +1035,7 @@ struct backref_ctx { | |||
1035 | 1035 | ||
1036 | static int __clone_root_cmp_bsearch(const void *key, const void *elt) | 1036 | static int __clone_root_cmp_bsearch(const void *key, const void *elt) |
1037 | { | 1037 | { |
1038 | u64 root = (u64)key; | 1038 | u64 root = (u64)(uintptr_t)key; |
1039 | struct clone_root *cr = (struct clone_root *)elt; | 1039 | struct clone_root *cr = (struct clone_root *)elt; |
1040 | 1040 | ||
1041 | if (root < cr->root->objectid) | 1041 | if (root < cr->root->objectid) |
@@ -1069,7 +1069,7 @@ static int __iterate_backrefs(u64 ino, u64 offset, u64 root, void *ctx_) | |||
1069 | u64 i_size; | 1069 | u64 i_size; |
1070 | 1070 | ||
1071 | /* First check if the root is in the list of accepted clone sources */ | 1071 | /* First check if the root is in the list of accepted clone sources */ |
1072 | found = bsearch((void *)root, bctx->sctx->clone_roots, | 1072 | found = bsearch((void *)(uintptr_t)root, bctx->sctx->clone_roots, |
1073 | bctx->sctx->clone_roots_cnt, | 1073 | bctx->sctx->clone_roots_cnt, |
1074 | sizeof(struct clone_root), | 1074 | sizeof(struct clone_root), |
1075 | __clone_root_cmp_bsearch); | 1075 | __clone_root_cmp_bsearch); |