Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 363e4d35 authored by Josef Bacik's avatar Josef Bacik Committed by Chris Mason
Browse files

Btrfs: remove space_info->reservation_progress 



This isn't used for anything anymore, just remove it.

Signed-off-by: default avatarJosef Bacik <jbacik@fusionio.com>
Signed-off-by: default avatarChris Mason <chris.mason@fusionio.com>
parent f0de181c

fs/btrfs/ctree.h

+0 −9
Original line number Diff line number Diff line
@@ -1118,15 +1118,6 @@ struct btrfs_space_info { 
	 */

	struct percpu_counter total_bytes_pinned;



	/*

	 * we bump reservation progress every time we decrement

	 * bytes_reserved.  This way people waiting for reservations

	 * know something good has happened and they can check

	 * for progress.  The number here isn't to be trusted, it

	 * just shows reclaim activity

	 */

	unsigned long reservation_progress;



	unsigned int full:1;	/* indicates that we cannot allocate any more

				   chunks for this space */

	unsigned int chunk_alloc:1;	/* set if we are allocating a chunk */

fs/btrfs/extent-tree.c

+0 −3
Original line number Diff line number Diff line
@@ -4456,7 +4456,6 @@ static void block_rsv_release_bytes(struct btrfs_fs_info *fs_info, 
			space_info->bytes_may_use -= num_bytes;

			trace_btrfs_space_reservation(fs_info, "space_info",

					space_info->flags, num_bytes, 0);

			space_info->reservation_progress++;

			spin_unlock(&space_info->lock);

		}

	}
@@ -4657,7 +4656,6 @@ static void update_global_block_rsv(struct btrfs_fs_info *fs_info) 
		sinfo->bytes_may_use -= num_bytes;

		trace_btrfs_space_reservation(fs_info, "space_info",

				      sinfo->flags, num_bytes, 0);

		sinfo->reservation_progress++;

		block_rsv->reserved = block_rsv->size;

		block_rsv->full = 1;

	}
@@ -5437,7 +5435,6 @@ static int btrfs_update_reserved_bytes(struct btrfs_block_group_cache *cache, 
			space_info->bytes_readonly += num_bytes;

		cache->reserved -= num_bytes;

		space_info->bytes_reserved -= num_bytes;

		space_info->reservation_progress++;

	}

	spin_unlock(&cache->lock);

	spin_unlock(&space_info->lock);