renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-11-20 08:38:24 +08:00
Code

Btrfs: 32 bit compile fixes for the resizer and enospc checks

Browse Source 
Signed-off-by: Chris Mason <chris.mason@oracle.com>
This commit is contained in:
Chris Mason 2008-01-03 09:22:38 -05:00
parent 4313b3994d
commit f9ef6604ac
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fs/btrfs/extent-tree.c
View File

@ -2501,6 +2501,7 @@ int btrfs_grow_extent_tree(struct btrfs_trans_handle *trans,
u64 nr = 0;
u64 cur_byte;
u64 old_size;
unsigned long rem;
struct btrfs_block_group_cache *cache;
struct btrfs_block_group_item *item;
struct btrfs_fs_info *info = root->fs_info;
@ -2538,7 +2539,8 @@ int btrfs_grow_extent_tree(struct btrfs_trans_handle *trans,
struct btrfs_block_group_item);
btrfs_set_disk_block_group_used(leaf, item, 0);
if (nr % 3) {
div_long_long_rem(nr, 3, &rem);
if (rem) {
btrfs_set_disk_block_group_flags(leaf, item,
BTRFS_BLOCK_GROUP_DATA);
} else {

10
fs/btrfs/inode.c
View File

@ -81,9 +81,11 @@ int btrfs_check_free_space(struct btrfs_root *root, u64 num_required,
int ret = 0;
if (for_del)
thresh = (total * 90) / 100;
thresh = total * 90;
else
thresh = (total * 85) / 100;
thresh = total * 85;
do_div(thresh, 100);
spin_lock(&root->fs_info->delalloc_lock);
if (used + root->fs_info->delalloc_bytes + num_required > thresh)
@ -2475,7 +2477,9 @@ static int btrfs_ioctl_resize(struct btrfs_root *root, void __user *arg)
ret = -EFBIG;
goto out_unlock;
}
new_size = (new_size / root->sectorsize) * root->sectorsize;
do_div(new_size, root->sectorsize);
new_size *= root->sectorsize;
printk("new size is %Lu\n", new_size);
if (new_size > old_size) {