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

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

btrfs: get fs_info from eb in btrfs_print_leaf, remove argument 



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

fs/btrfs/ctree.c

+7 −7
Original line number Diff line number Diff line
@@ -4650,7 +4650,7 @@ void btrfs_truncate_item(struct btrfs_fs_info *fs_info, 
	btrfs_mark_buffer_dirty(leaf);



	if (btrfs_leaf_free_space(fs_info, leaf) < 0) {

		btrfs_print_leaf(fs_info, leaf);

		btrfs_print_leaf(leaf);

		BUG();

	}

}
@@ -4679,7 +4679,7 @@ void btrfs_extend_item(struct btrfs_fs_info *fs_info, struct btrfs_path *path, 
	data_end = leaf_data_end(fs_info, leaf);



	if (btrfs_leaf_free_space(fs_info, leaf) < data_size) {

		btrfs_print_leaf(fs_info, leaf);

		btrfs_print_leaf(leaf);

		BUG();

	}

	slot = path->slots[0];
@@ -4687,7 +4687,7 @@ void btrfs_extend_item(struct btrfs_fs_info *fs_info, struct btrfs_path *path, 


	BUG_ON(slot < 0);

	if (slot >= nritems) {

		btrfs_print_leaf(fs_info, leaf);

		btrfs_print_leaf(leaf);

		btrfs_crit(fs_info, "slot %d too large, nritems %d",

			   slot, nritems);

		BUG_ON(1);
@@ -4718,7 +4718,7 @@ void btrfs_extend_item(struct btrfs_fs_info *fs_info, struct btrfs_path *path, 
	btrfs_mark_buffer_dirty(leaf);



	if (btrfs_leaf_free_space(fs_info, leaf) < 0) {

		btrfs_print_leaf(fs_info, leaf);

		btrfs_print_leaf(leaf);

		BUG();

	}

}
@@ -4757,7 +4757,7 @@ void setup_items_for_insert(struct btrfs_root *root, struct btrfs_path *path, 
	data_end = leaf_data_end(fs_info, leaf);



	if (btrfs_leaf_free_space(fs_info, leaf) < total_size) {

		btrfs_print_leaf(fs_info, leaf);

		btrfs_print_leaf(leaf);

		btrfs_crit(fs_info, "not enough freespace need %u have %d",

			   total_size, btrfs_leaf_free_space(fs_info, leaf));

		BUG();
@@ -4767,7 +4767,7 @@ void setup_items_for_insert(struct btrfs_root *root, struct btrfs_path *path, 
		unsigned int old_data = btrfs_item_end_nr(leaf, slot);



		if (old_data < data_end) {

			btrfs_print_leaf(fs_info, leaf);

			btrfs_print_leaf(leaf);

			btrfs_crit(fs_info, "slot %d old_data %d data_end %d",

				   slot, old_data, data_end);

			BUG_ON(1);
@@ -4811,7 +4811,7 @@ void setup_items_for_insert(struct btrfs_root *root, struct btrfs_path *path, 
	btrfs_mark_buffer_dirty(leaf);



	if (btrfs_leaf_free_space(fs_info, leaf) < 0) {

		btrfs_print_leaf(fs_info, leaf);

		btrfs_print_leaf(leaf);

		BUG();

	}

}

fs/btrfs/disk-io.c

+1 −1
Original line number Diff line number Diff line
@@ -3984,7 +3984,7 @@ void btrfs_mark_buffer_dirty(struct extent_buffer *buf) 
					 fs_info->dirty_metadata_batch);

#ifdef CONFIG_BTRFS_FS_CHECK_INTEGRITY

	if (btrfs_header_level(buf) == 0 && check_leaf(root, buf)) {

		btrfs_print_leaf(fs_info, buf);

		btrfs_print_leaf(buf);

		ASSERT(0);

	}

#endif

fs/btrfs/extent-tree.c

+3 −3
Original line number Diff line number Diff line
@@ -6960,7 +6960,7 @@ static int __btrfs_free_extent(struct btrfs_trans_handle *trans, 
					  "umm, got %d back from search, was looking for %llu",

					  ret, bytenr);

				if (ret > 0)

					btrfs_print_leaf(info, path->nodes[0]);

					btrfs_print_leaf(path->nodes[0]);

			}

			if (ret < 0) {

				btrfs_abort_transaction(trans, ret);
@@ -6969,7 +6969,7 @@ static int __btrfs_free_extent(struct btrfs_trans_handle *trans, 
			extent_slot = path->slots[0];

		}

	} else if (WARN_ON(ret == -ENOENT)) {

		btrfs_print_leaf(info, path->nodes[0]);

		btrfs_print_leaf(path->nodes[0]);

		btrfs_err(info,

			"unable to find ref byte nr %llu parent %llu root %llu  owner %llu offset %llu",

			bytenr, parent, root_objectid, owner_objectid,
@@ -7006,7 +7006,7 @@ static int __btrfs_free_extent(struct btrfs_trans_handle *trans, 
			btrfs_err(info,

				  "umm, got %d back from search, was looking for %llu",

				ret, bytenr);

			btrfs_print_leaf(info, path->nodes[0]);

			btrfs_print_leaf(path->nodes[0]);

		}

		if (ret < 0) {

			btrfs_abort_transaction(trans, ret);

fs/btrfs/print-tree.c

+4 −2
Original line number Diff line number Diff line
@@ -161,8 +161,9 @@ static void print_uuid_item(struct extent_buffer *l, unsigned long offset, 
	}

}



void btrfs_print_leaf(struct btrfs_fs_info *fs_info, struct extent_buffer *l)

void btrfs_print_leaf(struct extent_buffer *l)

{

	struct btrfs_fs_info *fs_info;

	int i;

	u32 type, nr;

	struct btrfs_item *item;
@@ -180,6 +181,7 @@ void btrfs_print_leaf(struct btrfs_fs_info *fs_info, struct extent_buffer *l) 
	if (!l)

		return;



	fs_info = l->fs_info;

	nr = btrfs_header_nritems(l);



	btrfs_info(fs_info, "leaf %llu total ptrs %d free space %d",
@@ -329,7 +331,7 @@ void btrfs_print_tree(struct btrfs_fs_info *fs_info, struct extent_buffer *c) 
	nr = btrfs_header_nritems(c);

	level = btrfs_header_level(c);

	if (level == 0) {

		btrfs_print_leaf(fs_info, c);

		btrfs_print_leaf(c);

		return;

	}

	btrfs_info(fs_info,

fs/btrfs/print-tree.h

+1 −1
Original line number Diff line number Diff line
@@ -18,6 +18,6 @@ 


#ifndef __PRINT_TREE_

#define __PRINT_TREE_

void btrfs_print_leaf(struct btrfs_fs_info *fs_info, struct extent_buffer *l);

void btrfs_print_leaf(struct extent_buffer *l);

void btrfs_print_tree(struct btrfs_fs_info *fs_info, struct extent_buffer *c);

#endif