32 bit compile fixes
This commit is contained in:
parent
84e9d08a4b
commit
f8d7bbd1fa
|
@ -88,7 +88,7 @@ static unsigned long __ffs(unsigned long word)
|
||||||
|
|
||||||
if (sizeof(long) == 8 && (word & 0xffffffff) == 0) {
|
if (sizeof(long) == 8 && (word & 0xffffffff) == 0) {
|
||||||
num += 32;
|
num += 32;
|
||||||
word >>= 32;
|
word >>= sizeof(long) * 4;
|
||||||
}
|
}
|
||||||
if ((word & 0xffff) == 0) {
|
if ((word & 0xffff) == 0) {
|
||||||
num += 16;
|
num += 16;
|
||||||
|
|
|
@ -299,9 +299,10 @@ static int __free_extent(struct btrfs_trans_handle *trans, struct btrfs_root
|
||||||
u64 super_blocks_used;
|
u64 super_blocks_used;
|
||||||
if (pin) {
|
if (pin) {
|
||||||
int err;
|
int err;
|
||||||
|
unsigned long bl = blocknr;
|
||||||
radix_tree_preload(GFP_KERNEL);
|
radix_tree_preload(GFP_KERNEL);
|
||||||
err = radix_tree_insert(&info->pinned_radix,
|
err = radix_tree_insert(&info->pinned_radix,
|
||||||
blocknr, (void *)blocknr);
|
blocknr, (void *)bl);
|
||||||
BUG_ON(err);
|
BUG_ON(err);
|
||||||
radix_tree_preload_end();
|
radix_tree_preload_end();
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue