32 bit compile fixes

diff --git a/bit-radix.c b/bit-radix.c
index cd9928a3b6d5787ab332689677f8e5f076d375f5..7509b31a5a5f946c7fb113b98efe435a2a996416 100644 (file)
--- a/bit-radix.c
+++ b/bit-radix.c
@@ -88,7 +88,7 @@ static unsigned long __ffs(unsigned long word)
 
        if (sizeof(long) == 8 && (word & 0xffffffff) == 0) {
                num += 32;
-               word >>= 32;
+               word >>= sizeof(long) * 4;
        }
        if ((word & 0xffff) == 0) {
                num += 16;

diff --git a/extent-tree.c b/extent-tree.c
index 82952ef9c6056d0245c97a89145d3153d813a508..5b3c3da42824f0314289d3d0ee8ddcfbec63b83a 100644 (file)
--- a/extent-tree.c
+++ b/extent-tree.c
@@ -299,9 +299,10 @@ static int __free_extent(struct btrfs_trans_handle *trans, struct btrfs_root
                u64 super_blocks_used;
                if (pin) {
                        int err;
+                       unsigned long bl = blocknr;
                        radix_tree_preload(GFP_KERNEL);
                        err = radix_tree_insert(&info->pinned_radix,
-                                               blocknr, (void *)blocknr);
+                                               blocknr, (void *)bl);
                        BUG_ON(err);
                        radix_tree_preload_end();
                }