aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosef Bacik <josef@redhat.com>2011-08-08 14:03:37 -0400
committerJosef Bacik <josef@redhat.com>2011-10-19 15:12:36 -0400
commit5e962c7850c273b483acc747b41bd5cddf631049 (patch)
treec916196b6eae6c4f56dc46ca5ffad284dc6ecc78
parent907cbcebd4e5f641faf08601f216b1ceb6cb3bdf (diff)
Btrfs: kill btrfs_truncate_reserve_metadata
Since we've optimized the truncate path, we no longer require this function. Signed-off-by: Josef Bacik <josef@redhat.com>
-rw-r--r--fs/btrfs/ctree.h3
-rw-r--r--fs/btrfs/extent-tree.c31
2 files changed, 0 insertions, 34 deletions
diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h
index 58a06dea4791..22a9347a3908 100644
--- a/fs/btrfs/ctree.h
+++ b/fs/btrfs/ctree.h
@@ -2240,9 +2240,6 @@ int btrfs_block_rsv_migrate(struct btrfs_block_rsv *src_rsv,
2240void btrfs_block_rsv_release(struct btrfs_root *root, 2240void btrfs_block_rsv_release(struct btrfs_root *root,
2241 struct btrfs_block_rsv *block_rsv, 2241 struct btrfs_block_rsv *block_rsv,
2242 u64 num_bytes); 2242 u64 num_bytes);
2243int btrfs_truncate_reserve_metadata(struct btrfs_trans_handle *trans,
2244 struct btrfs_root *root,
2245 struct btrfs_block_rsv *rsv);
2246int btrfs_set_block_group_ro(struct btrfs_root *root, 2243int btrfs_set_block_group_ro(struct btrfs_root *root,
2247 struct btrfs_block_group_cache *cache); 2244 struct btrfs_block_group_cache *cache);
2248int btrfs_set_block_group_rw(struct btrfs_root *root, 2245int btrfs_set_block_group_rw(struct btrfs_root *root,
diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c
index 6356ef2f0c80..d05967e9d613 100644
--- a/fs/btrfs/extent-tree.c
+++ b/fs/btrfs/extent-tree.c
@@ -3858,37 +3858,6 @@ static void release_global_block_rsv(struct btrfs_fs_info *fs_info)
3858 WARN_ON(fs_info->chunk_block_rsv.reserved > 0); 3858 WARN_ON(fs_info->chunk_block_rsv.reserved > 0);
3859} 3859}
3860 3860
3861int btrfs_truncate_reserve_metadata(struct btrfs_trans_handle *trans,
3862 struct btrfs_root *root,
3863 struct btrfs_block_rsv *rsv)
3864{
3865 struct btrfs_block_rsv *trans_rsv = &root->fs_info->trans_block_rsv;
3866 u64 num_bytes;
3867 int ret;
3868
3869 /*
3870 * Truncate should be freeing data, but give us 2 items just in case it
3871 * needs to use some space. We may want to be smarter about this in the
3872 * future.
3873 */
3874 num_bytes = btrfs_calc_trans_metadata_size(root, 2);
3875
3876 /* We already have enough bytes, just return */
3877 if (rsv->reserved >= num_bytes)
3878 return 0;
3879
3880 num_bytes -= rsv->reserved;
3881
3882 /*
3883 * You should have reserved enough space before hand to do this, so this
3884 * should not fail.
3885 */
3886 ret = block_rsv_migrate_bytes(trans_rsv, rsv, num_bytes);
3887 BUG_ON(ret);
3888
3889 return 0;
3890}
3891
3892void btrfs_trans_release_metadata(struct btrfs_trans_handle *trans, 3861void btrfs_trans_release_metadata(struct btrfs_trans_handle *trans,
3893 struct btrfs_root *root) 3862 struct btrfs_root *root)
3894{ 3863{