Commit 062f3d02 authored by Daniel Vacek's avatar Daniel Vacek Committed by David Sterba
Browse files

btrfs: remove unused flag EXTENT_BUFFER_IN_TREE 



This flag is set after inserting the eb to the buffer tree and cleared
on it's removal.  It was added in commit 34b41ace ("Btrfs: use a
bit to track if we're in the radix tree") and wanted to make use of it,
faa2dbf0 ("Btrfs: add sanity tests for new qgroup accounting
code"). Both are 10+ years old, we can remove the flag.

Signed-off-by: default avatarDaniel Vacek <neelx@suse.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent c61660ec

fs/btrfs/extent_io.c

+6 −12
Original line number Diff line number Diff line
@@ -3044,7 +3044,6 @@ struct extent_buffer *alloc_test_extent_buffer(struct btrfs_fs_info *fs_info, 
			goto again;

	}

	check_buffer_tree_ref(eb);

	set_bit(EXTENT_BUFFER_IN_TREE, &eb->bflags);



	return eb;

free_eb:
@@ -3364,7 +3363,6 @@ struct extent_buffer *alloc_extent_buffer(struct btrfs_fs_info *fs_info, 
	}

	/* add one reference for the tree */

	check_buffer_tree_ref(eb);

	set_bit(EXTENT_BUFFER_IN_TREE, &eb->bflags);



	/*

	 * Now it's safe to unlock the pages because any calls to
@@ -3428,18 +3426,14 @@ static int release_extent_buffer(struct extent_buffer *eb) 


	WARN_ON(atomic_read(&eb->refs) == 0);

	if (atomic_dec_and_test(&eb->refs)) {

		if (test_and_clear_bit(EXTENT_BUFFER_IN_TREE, &eb->bflags)) {

		struct btrfs_fs_info *fs_info = eb->fs_info;



		spin_unlock(&eb->refs_lock);



		spin_lock(&fs_info->buffer_lock);

			radix_tree_delete(&fs_info->buffer_radix,

					  eb->start >> fs_info->sectorsize_bits);

		radix_tree_delete_item(&fs_info->buffer_radix,

				       eb->start >> fs_info->sectorsize_bits, eb);

		spin_unlock(&fs_info->buffer_lock);

		} else {

			spin_unlock(&eb->refs_lock);

		}



		btrfs_leak_debug_del_eb(eb);

		/* Should be safe to release folios at this point. */

fs/btrfs/extent_io.h

+0 −1
Original line number Diff line number Diff line
@@ -42,7 +42,6 @@ enum { 
	EXTENT_BUFFER_STALE,

	EXTENT_BUFFER_WRITEBACK,

	EXTENT_BUFFER_UNMAPPED,

	EXTENT_BUFFER_IN_TREE,

	/* write IO error */

	EXTENT_BUFFER_WRITE_ERR,

	/* Indicate the extent buffer is written zeroed out (for zoned) */