Commit e4058b54 authored by David Sterba's avatar David Sterba
Browse files

btrfs: cleanup, use enum values for btrfs_path reada 



Replace the integers by enums for better readability. The value 2 does
not have any meaning since a7175319
"Btrfs: do less aggressive btree readahead" (2009-01-22).

Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 4d4ab6d6

fs/btrfs/ctree.c

+4 −5
Original line number Diff line number Diff line
@@ -2248,7 +2248,6 @@ static void reada_for_search(struct btrfs_root *root, 
	u64 target;

	u64 nread = 0;

	u64 gen;

	int direction = path->reada;

	struct extent_buffer *eb;

	u32 nr;

	u32 blocksize;
@@ -2276,16 +2275,16 @@ static void reada_for_search(struct btrfs_root *root, 
	nr = slot;



	while (1) {

		if (direction < 0) {

		if (path->reada == READA_BACK) {

			if (nr == 0)

				break;

			nr--;

		} else if (direction > 0) {

		} else if (path->reada == READA_FORWARD) {

			nr++;

			if (nr >= nritems)

				break;

		}

		if (path->reada < 0 && objectid) {

		if (path->reada == READA_BACK && objectid) {

			btrfs_node_key(node, &disk_key, nr);

			if (btrfs_disk_key_objectid(&disk_key) != objectid)

				break;
@@ -2493,7 +2492,7 @@ read_block_for_search(struct btrfs_trans_handle *trans, 
	btrfs_set_path_blocking(p);



	free_extent_buffer(tmp);

	if (p->reada)

	if (p->reada != READA_NONE)

		reada_for_search(root, p, level, slot, key->objectid);



	btrfs_release_path(p);

fs/btrfs/ctree.h

+1 −0
Original line number Diff line number Diff line
@@ -590,6 +590,7 @@ struct btrfs_node { 
 * The slots array records the index of the item or block pointer

 * used while walking the tree.

 */

enum { READA_NONE = 0, READA_BACK, READA_FORWARD };

struct btrfs_path {

	struct extent_buffer *nodes[BTRFS_MAX_LEVEL];

	int slots[BTRFS_MAX_LEVEL];

fs/btrfs/extent-tree.c

+6 −6
Original line number Diff line number Diff line
@@ -438,7 +438,7 @@ static noinline void caching_thread(struct btrfs_work *work) 
	 */

	path->skip_locking = 1;

	path->search_commit_root = 1;

	path->reada = 1;

	path->reada = READA_FORWARD;



	key.objectid = last;

	key.offset = 0;
@@ -2115,7 +2115,7 @@ static int __btrfs_inc_extent_ref(struct btrfs_trans_handle *trans, 
	if (!path)

		return -ENOMEM;



	path->reada = 1;

	path->reada = READA_FORWARD;

	path->leave_spinning = 1;

	/* this will setup the path even if it fails to insert the back ref */

	ret = insert_inline_extent_backref(trans, fs_info->extent_root, path,
@@ -2141,7 +2141,7 @@ static int __btrfs_inc_extent_ref(struct btrfs_trans_handle *trans, 
	btrfs_mark_buffer_dirty(leaf);

	btrfs_release_path(path);



	path->reada = 1;

	path->reada = READA_FORWARD;

	path->leave_spinning = 1;

	/* now insert the actual backref */

	ret = insert_extent_backref(trans, root->fs_info->extent_root,
@@ -2254,7 +2254,7 @@ static int run_delayed_extent_op(struct btrfs_trans_handle *trans, 
	}



again:

	path->reada = 1;

	path->reada = READA_FORWARD;

	path->leave_spinning = 1;

	ret = btrfs_search_slot(trans, root->fs_info->extent_root, &key,

				path, 0, 1);
@@ -6438,7 +6438,7 @@ static int __btrfs_free_extent(struct btrfs_trans_handle *trans, 
	if (!path)

		return -ENOMEM;



	path->reada = 1;

	path->reada = READA_FORWARD;

	path->leave_spinning = 1;



	is_data = owner_objectid >= BTRFS_FIRST_FREE_OBJECTID;
@@ -9688,7 +9688,7 @@ int btrfs_read_block_groups(struct btrfs_root *root) 
	path = btrfs_alloc_path();

	if (!path)

		return -ENOMEM;

	path->reada = 1;

	path->reada = READA_FORWARD;



	cache_gen = btrfs_super_cache_generation(root->fs_info->super_copy);

	if (btrfs_test_opt(root, SPACE_CACHE) &&

fs/btrfs/file-item.c

+2 −2
Original line number Diff line number Diff line
@@ -202,7 +202,7 @@ static int __btrfs_lookup_bio_sums(struct btrfs_root *root, 
	}



	if (bio->bi_iter.bi_size > PAGE_CACHE_SIZE * 8)

		path->reada = 2;

		path->reada = READA_FORWARD;



	WARN_ON(bio->bi_vcnt <= 0);
@@ -328,7 +328,7 @@ int btrfs_lookup_csums_range(struct btrfs_root *root, u64 start, u64 end, 


	if (search_commit) {

		path->skip_locking = 1;

		path->reada = 2;

		path->reada = READA_FORWARD;

		path->search_commit_root = 1;

	}

fs/btrfs/inode-map.c

+1 −1
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ static int caching_kthread(void *data) 
	/* Since the commit root is read-only, we can safely skip locking. */

	path->skip_locking = 1;

	path->search_commit_root = 1;

	path->reada = 2;

	path->reada = READA_FORWARD;



	key.objectid = BTRFS_FIRST_FREE_OBJECTID;

	key.offset = 0;

CRA Git | Maintained and supported by SUSTech CRA and CCSE