|
@@ -3312,7 +3312,8 @@ commit_trans:
|
|
|
}
|
|
|
data_sinfo->bytes_may_use += bytes;
|
|
|
trace_btrfs_space_reservation(root->fs_info, "space_info",
|
|
|
- (u64)data_sinfo, bytes, 1);
|
|
|
+ (u64)(unsigned long)data_sinfo,
|
|
|
+ bytes, 1);
|
|
|
spin_unlock(&data_sinfo->lock);
|
|
|
|
|
|
return 0;
|
|
@@ -3333,7 +3334,8 @@ void btrfs_free_reserved_data_space(struct inode *inode, u64 bytes)
|
|
|
spin_lock(&data_sinfo->lock);
|
|
|
data_sinfo->bytes_may_use -= bytes;
|
|
|
trace_btrfs_space_reservation(root->fs_info, "space_info",
|
|
|
- (u64)data_sinfo, bytes, 0);
|
|
|
+ (u64)(unsigned long)data_sinfo,
|
|
|
+ bytes, 0);
|
|
|
spin_unlock(&data_sinfo->lock);
|
|
|
}
|
|
|
|
|
@@ -3698,9 +3700,9 @@ again:
|
|
|
if (used + orig_bytes <= space_info->total_bytes) {
|
|
|
space_info->bytes_may_use += orig_bytes;
|
|
|
trace_btrfs_space_reservation(root->fs_info,
|
|
|
- "space_info",
|
|
|
- (u64)space_info,
|
|
|
- orig_bytes, 1);
|
|
|
+ "space_info",
|
|
|
+ (u64)(unsigned long)space_info,
|
|
|
+ orig_bytes, 1);
|
|
|
ret = 0;
|
|
|
} else {
|
|
|
/*
|
|
@@ -3769,9 +3771,9 @@ again:
|
|
|
if (used + num_bytes < space_info->total_bytes + avail) {
|
|
|
space_info->bytes_may_use += orig_bytes;
|
|
|
trace_btrfs_space_reservation(root->fs_info,
|
|
|
- "space_info",
|
|
|
- (u64)space_info,
|
|
|
- orig_bytes, 1);
|
|
|
+ "space_info",
|
|
|
+ (u64)(unsigned long)space_info,
|
|
|
+ orig_bytes, 1);
|
|
|
ret = 0;
|
|
|
} else {
|
|
|
wait_ordered = true;
|
|
@@ -3916,8 +3918,8 @@ static void block_rsv_release_bytes(struct btrfs_fs_info *fs_info,
|
|
|
spin_lock(&space_info->lock);
|
|
|
space_info->bytes_may_use -= num_bytes;
|
|
|
trace_btrfs_space_reservation(fs_info, "space_info",
|
|
|
- (u64)space_info,
|
|
|
- num_bytes, 0);
|
|
|
+ (u64)(unsigned long)space_info,
|
|
|
+ num_bytes, 0);
|
|
|
space_info->reservation_progress++;
|
|
|
spin_unlock(&space_info->lock);
|
|
|
}
|
|
@@ -4135,14 +4137,14 @@ static void update_global_block_rsv(struct btrfs_fs_info *fs_info)
|
|
|
block_rsv->reserved += num_bytes;
|
|
|
sinfo->bytes_may_use += num_bytes;
|
|
|
trace_btrfs_space_reservation(fs_info, "space_info",
|
|
|
- (u64)sinfo, num_bytes, 1);
|
|
|
+ (u64)(unsigned long)sinfo, num_bytes, 1);
|
|
|
}
|
|
|
|
|
|
if (block_rsv->reserved >= block_rsv->size) {
|
|
|
num_bytes = block_rsv->reserved - block_rsv->size;
|
|
|
sinfo->bytes_may_use -= num_bytes;
|
|
|
trace_btrfs_space_reservation(fs_info, "space_info",
|
|
|
- (u64)sinfo, num_bytes, 0);
|
|
|
+ (u64)(unsigned long)sinfo, num_bytes, 0);
|
|
|
sinfo->reservation_progress++;
|
|
|
block_rsv->reserved = block_rsv->size;
|
|
|
block_rsv->full = 1;
|
|
@@ -4195,7 +4197,8 @@ void btrfs_trans_release_metadata(struct btrfs_trans_handle *trans,
|
|
|
if (!trans->bytes_reserved)
|
|
|
return;
|
|
|
|
|
|
- trace_btrfs_space_reservation(root->fs_info, "transaction", (u64)trans,
|
|
|
+ trace_btrfs_space_reservation(root->fs_info, "transaction",
|
|
|
+ (u64)(unsigned long)trans,
|
|
|
trans->bytes_reserved, 0);
|
|
|
btrfs_block_rsv_release(root, trans->block_rsv, trans->bytes_reserved);
|
|
|
trans->bytes_reserved = 0;
|
|
@@ -4713,9 +4716,9 @@ static int btrfs_update_reserved_bytes(struct btrfs_block_group_cache *cache,
|
|
|
space_info->bytes_reserved += num_bytes;
|
|
|
if (reserve == RESERVE_ALLOC) {
|
|
|
trace_btrfs_space_reservation(cache->fs_info,
|
|
|
- "space_info",
|
|
|
- (u64)space_info,
|
|
|
- num_bytes, 0);
|
|
|
+ "space_info",
|
|
|
+ (u64)(unsigned long)space_info,
|
|
|
+ num_bytes, 0);
|
|
|
space_info->bytes_may_use -= num_bytes;
|
|
|
}
|
|
|
}
|