Commit f3e75e38 authored by Josef Bacik's avatar Josef Bacik Committed by David Sterba
Browse files

btrfs: roll tracepoint into btrfs_space_info_update helper 



We duplicate this tracepoint everywhere we call these helpers, so update
the helper to have the tracepoint as well.

Signed-off-by: default avatarJosef Bacik <josef@toxicpanda.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent ef1317a1

fs/btrfs/block-group.c

+0 −3
Original line number Diff line number Diff line
@@ -2696,9 +2696,6 @@ int btrfs_update_block_group(struct btrfs_trans_handle *trans, 
			spin_unlock(&cache->lock);

			spin_unlock(&cache->space_info->lock);



			trace_btrfs_space_reservation(info, "pinned",

						      cache->space_info->flags,

						      num_bytes, 1);

			percpu_counter_add_batch(

					&cache->space_info->total_bytes_pinned,

					num_bytes,

fs/btrfs/block-rsv.c

+0 −5
Original line number Diff line number Diff line
@@ -283,16 +283,11 @@ void btrfs_update_global_block_rsv(struct btrfs_fs_info *fs_info) 
			block_rsv->reserved += num_bytes;

			btrfs_space_info_update_bytes_may_use(fs_info, sinfo,

							      num_bytes);

			trace_btrfs_space_reservation(fs_info, "space_info",

						      sinfo->flags, num_bytes,

						      1);

		}

	} else if (block_rsv->reserved > block_rsv->size) {

		num_bytes = block_rsv->reserved - block_rsv->size;

		btrfs_space_info_update_bytes_may_use(fs_info, sinfo,

						      -num_bytes);

		trace_btrfs_space_reservation(fs_info, "space_info",

				      sinfo->flags, num_bytes, 0);

		block_rsv->reserved = block_rsv->size;

	}

fs/btrfs/delalloc-space.c

+0 −4
Original line number Diff line number Diff line
@@ -130,8 +130,6 @@ int btrfs_alloc_data_chunk_ondemand(struct btrfs_inode *inode, u64 bytes) 
		return -ENOSPC;

	}

	btrfs_space_info_update_bytes_may_use(fs_info, data_sinfo, bytes);

	trace_btrfs_space_reservation(fs_info, "space_info",

				      data_sinfo->flags, bytes, 1);

	spin_unlock(&data_sinfo->lock);



	return 0;
@@ -183,8 +181,6 @@ void btrfs_free_reserved_data_space_noquota(struct inode *inode, u64 start, 
	data_sinfo = fs_info->data_sinfo;

	spin_lock(&data_sinfo->lock);

	btrfs_space_info_update_bytes_may_use(fs_info, data_sinfo, -len);

	trace_btrfs_space_reservation(fs_info, "space_info",

				      data_sinfo->flags, len, 0);

	spin_unlock(&data_sinfo->lock);

}

fs/btrfs/extent-tree.c

+0 −9
Original line number Diff line number Diff line
@@ -2583,8 +2583,6 @@ static int pin_down_extent(struct btrfs_block_group_cache *cache, 
	spin_unlock(&cache->lock);

	spin_unlock(&cache->space_info->lock);



	trace_btrfs_space_reservation(fs_info, "pinned",

				      cache->space_info->flags, num_bytes, 1);

	percpu_counter_add_batch(&cache->space_info->total_bytes_pinned,

		    num_bytes, BTRFS_TOTAL_BYTES_PINNED_BATCH);

	set_extent_dirty(fs_info->pinned_extents, bytenr,
@@ -2842,9 +2840,6 @@ static int unpin_extent_range(struct btrfs_fs_info *fs_info, 
		spin_lock(&cache->lock);

		cache->pinned -= len;

		btrfs_space_info_update_bytes_pinned(fs_info, space_info, -len);



		trace_btrfs_space_reservation(fs_info, "pinned",

					      space_info->flags, len, 0);

		space_info->max_extent_size = 0;

		percpu_counter_add_batch(&space_info->total_bytes_pinned,

			    -len, BTRFS_TOTAL_BYTES_PINNED_BATCH);
@@ -2866,10 +2861,6 @@ static int unpin_extent_range(struct btrfs_fs_info *fs_info, 
						space_info, to_add);

				if (global_rsv->reserved >= global_rsv->size)

					global_rsv->full = 1;

				trace_btrfs_space_reservation(fs_info,

							      "space_info",

							      space_info->flags,

							      to_add, 1);

				len -= to_add;

			}

			spin_unlock(&global_rsv->lock);

fs/btrfs/space-info.c

+0 −10
Original line number Diff line number Diff line
@@ -279,8 +279,6 @@ void btrfs_space_info_add_old_bytes(struct btrfs_fs_info *fs_info, 
		goto again;

	}

	btrfs_space_info_update_bytes_may_use(fs_info, space_info, -num_bytes);

	trace_btrfs_space_reservation(fs_info, "space_info",

				      space_info->flags, num_bytes, 0);

	spin_unlock(&space_info->lock);

}
@@ -301,9 +299,6 @@ void btrfs_space_info_add_new_bytes(struct btrfs_fs_info *fs_info, 
		ticket = list_first_entry(head, struct reserve_ticket,

					  list);

		if (num_bytes >= ticket->bytes) {

			trace_btrfs_space_reservation(fs_info, "space_info",

						      space_info->flags,

						      ticket->bytes, 1);

			list_del_init(&ticket->list);

			num_bytes -= ticket->bytes;

			btrfs_space_info_update_bytes_may_use(fs_info,
@@ -313,9 +308,6 @@ void btrfs_space_info_add_new_bytes(struct btrfs_fs_info *fs_info, 
			space_info->tickets_id++;

			wake_up(&ticket->wait);

		} else {

			trace_btrfs_space_reservation(fs_info, "space_info",

						      space_info->flags,

						      num_bytes, 1);

			btrfs_space_info_update_bytes_may_use(fs_info,

							      space_info,

							      num_bytes);
@@ -1014,8 +1006,6 @@ static int __reserve_metadata_bytes(struct btrfs_fs_info *fs_info, 
			   system_chunk))) {

		btrfs_space_info_update_bytes_may_use(fs_info, space_info,

						      orig_bytes);

		trace_btrfs_space_reservation(fs_info, "space_info",

					      space_info->flags, orig_bytes, 1);

		ret = 0;

	}