aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosef Bacik <jbacik@fusionio.com>2013-09-17 11:02:25 -0400
committerChris Mason <chris.mason@fusionio.com>2013-09-21 11:05:27 -0400
commit363e4d354e51558629d13c5ae456f98c4b209576 (patch)
treedc6a3af2154f8737af81df6ce1d74334cb1d6844
parentf0de181c9b48a397c5a2fbe63dcdd2a26a872695 (diff)
Btrfs: remove space_info->reservation_progress
This isn't used for anything anymore, just remove it. Signed-off-by: Josef Bacik <jbacik@fusionio.com> Signed-off-by: Chris Mason <chris.mason@fusionio.com>
-rw-r--r--fs/btrfs/ctree.h9
-rw-r--r--fs/btrfs/extent-tree.c3
2 files changed, 0 insertions, 12 deletions
diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h
index 36490b92ee33..0506f40ede83 100644
--- a/fs/btrfs/ctree.h
+++ b/fs/btrfs/ctree.h
@@ -1118,15 +1118,6 @@ struct btrfs_space_info {
1118 */ 1118 */
1119 struct percpu_counter total_bytes_pinned; 1119 struct percpu_counter total_bytes_pinned;
1120 1120
1121 /*
1122 * we bump reservation progress every time we decrement
1123 * bytes_reserved. This way people waiting for reservations
1124 * know something good has happened and they can check
1125 * for progress. The number here isn't to be trusted, it
1126 * just shows reclaim activity
1127 */
1128 unsigned long reservation_progress;
1129
1130 unsigned int full:1; /* indicates that we cannot allocate any more 1121 unsigned int full:1; /* indicates that we cannot allocate any more
1131 chunks for this space */ 1122 chunks for this space */
1132 unsigned int chunk_alloc:1; /* set if we are allocating a chunk */ 1123 unsigned int chunk_alloc:1; /* set if we are allocating a chunk */
diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c
index 88c6db611de3..d58bef130a41 100644
--- a/fs/btrfs/extent-tree.c
+++ b/fs/btrfs/extent-tree.c
@@ -4456,7 +4456,6 @@ static void block_rsv_release_bytes(struct btrfs_fs_info *fs_info,
4456 space_info->bytes_may_use -= num_bytes; 4456 space_info->bytes_may_use -= num_bytes;
4457 trace_btrfs_space_reservation(fs_info, "space_info", 4457 trace_btrfs_space_reservation(fs_info, "space_info",
4458 space_info->flags, num_bytes, 0); 4458 space_info->flags, num_bytes, 0);
4459 space_info->reservation_progress++;
4460 spin_unlock(&space_info->lock); 4459 spin_unlock(&space_info->lock);
4461 } 4460 }
4462 } 4461 }
@@ -4657,7 +4656,6 @@ static void update_global_block_rsv(struct btrfs_fs_info *fs_info)
4657 sinfo->bytes_may_use -= num_bytes; 4656 sinfo->bytes_may_use -= num_bytes;
4658 trace_btrfs_space_reservation(fs_info, "space_info", 4657 trace_btrfs_space_reservation(fs_info, "space_info",
4659 sinfo->flags, num_bytes, 0); 4658 sinfo->flags, num_bytes, 0);
4660 sinfo->reservation_progress++;
4661 block_rsv->reserved = block_rsv->size; 4659 block_rsv->reserved = block_rsv->size;
4662 block_rsv->full = 1; 4660 block_rsv->full = 1;
4663 } 4661 }
@@ -5437,7 +5435,6 @@ static int btrfs_update_reserved_bytes(struct btrfs_block_group_cache *cache,
5437 space_info->bytes_readonly += num_bytes; 5435 space_info->bytes_readonly += num_bytes;
5438 cache->reserved -= num_bytes; 5436 cache->reserved -= num_bytes;
5439 space_info->bytes_reserved -= num_bytes; 5437 space_info->bytes_reserved -= num_bytes;
5440 space_info->reservation_progress++;
5441 } 5438 }
5442 spin_unlock(&cache->lock); 5439 spin_unlock(&cache->lock);
5443 spin_unlock(&space_info->lock); 5440 spin_unlock(&space_info->lock);