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

Commit 2ff7e61e authored by Jeff Mahoney's avatar Jeff Mahoney Committed by David Sterba
Browse files

btrfs: take an fs_info directly when the root is not used otherwise 



There are loads of functions in btrfs that accept a root parameter
but only use it to obtain an fs_info pointer.  Let's convert those to
just accept an fs_info pointer directly.

Signed-off-by: default avatarJeff Mahoney <jeffm@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent afdb5718

fs/btrfs/backref.c

+2 −4
Original line number Diff line number Diff line
@@ -788,8 +788,7 @@ static int __add_missing_keys(struct btrfs_fs_info *fs_info, 
		if (ref->key_for_search.type)

			continue;

		BUG_ON(!ref->wanted_disk_byte);

		eb = read_tree_block(fs_info->tree_root, ref->wanted_disk_byte,

				     0);

		eb = read_tree_block(fs_info, ref->wanted_disk_byte, 0);

		if (IS_ERR(eb)) {

			return PTR_ERR(eb);

		} else if (!extent_buffer_uptodate(eb)) {
@@ -1405,8 +1404,7 @@ static int find_parent_nodes(struct btrfs_trans_handle *trans, 
			    ref->level == 0) {

				struct extent_buffer *eb;



				eb = read_tree_block(fs_info->extent_root,

							   ref->parent, 0);

				eb = read_tree_block(fs_info, ref->parent, 0);

				if (IS_ERR(eb)) {

					ret = PTR_ERR(eb);

					goto out;

fs/btrfs/check-integrity.c

+4 −6
Original line number Diff line number Diff line
@@ -2904,14 +2904,13 @@ int btrfsic_submit_bio_wait(struct bio *bio) 
	return submit_bio_wait(bio);

}



int btrfsic_mount(struct btrfs_root *root,

int btrfsic_mount(struct btrfs_fs_info *fs_info,

		  struct btrfs_fs_devices *fs_devices,

		  int including_extent_data, u32 print_mask)

{

	int ret;

	struct btrfsic_state *state;

	struct list_head *dev_head = &fs_devices->devices;

	struct btrfs_fs_info *fs_info = root->fs_info;

	struct btrfs_device *device;



	if (fs_info->nodesize & ((u64)PAGE_SIZE - 1)) {
@@ -2939,7 +2938,7 @@ int btrfsic_mount(struct btrfs_root *root, 
		btrfsic_is_initialized = 1;

	}

	mutex_lock(&btrfsic_mutex);

	state->fs_info = root->fs_info;

	state->fs_info = fs_info;

	state->print_mask = print_mask;

	state->include_extent_data = including_extent_data;

	state->csum_size = 0;
@@ -2977,7 +2976,7 @@ int btrfsic_mount(struct btrfs_root *root, 
	ret = btrfsic_process_superblock(state, fs_devices);

	if (0 != ret) {

		mutex_unlock(&btrfsic_mutex);

		btrfsic_unmount(root, fs_devices);

		btrfsic_unmount(fs_devices);

		return ret;

	}
@@ -2990,8 +2989,7 @@ int btrfsic_mount(struct btrfs_root *root, 
	return 0;

}



void btrfsic_unmount(struct btrfs_root *root,

		     struct btrfs_fs_devices *fs_devices)

void btrfsic_unmount(struct btrfs_fs_devices *fs_devices)

{

	struct btrfsic_block *b_all, *tmp_all;

	struct btrfsic_state *state;

fs/btrfs/check-integrity.h

+2 −3
Original line number Diff line number Diff line
@@ -29,10 +29,9 @@ int btrfsic_submit_bio_wait(struct bio *bio); 
#define btrfsic_submit_bio_wait submit_bio_wait

#endif



int btrfsic_mount(struct btrfs_root *root,

int btrfsic_mount(struct btrfs_fs_info *fs_info,

		  struct btrfs_fs_devices *fs_devices,

		  int including_extent_data, u32 print_mask);

void btrfsic_unmount(struct btrfs_root *root,

		     struct btrfs_fs_devices *fs_devices);

void btrfsic_unmount(struct btrfs_fs_devices *fs_devices);



#endif

fs/btrfs/compression.c

+12 −16
Original line number Diff line number Diff line
@@ -85,10 +85,9 @@ static int btrfs_decompress_bio(int type, struct page **pages_in, 
				   u64 disk_start, struct bio *orig_bio,

				   size_t srclen);



static inline int compressed_bio_size(struct btrfs_root *root,

static inline int compressed_bio_size(struct btrfs_fs_info *fs_info,

				      unsigned long disk_size)

{

	struct btrfs_fs_info *fs_info = root->fs_info;

	u16 csum_size = btrfs_super_csum_size(fs_info->super_copy);



	return sizeof(struct compressed_bio) +
@@ -331,7 +330,6 @@ int btrfs_submit_compressed_write(struct inode *inode, u64 start, 
{

	struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb);

	struct bio *bio = NULL;

	struct btrfs_root *root = BTRFS_I(inode)->root;

	struct compressed_bio *cb;

	unsigned long bytes_left;

	struct extent_io_tree *io_tree = &BTRFS_I(inode)->io_tree;
@@ -343,7 +341,7 @@ int btrfs_submit_compressed_write(struct inode *inode, u64 start, 
	int skip_sum = BTRFS_I(inode)->flags & BTRFS_INODE_NODATASUM;



	WARN_ON(start & ((u64)PAGE_SIZE - 1));

	cb = kmalloc(compressed_bio_size(root, compressed_len), GFP_NOFS);

	cb = kmalloc(compressed_bio_size(fs_info, compressed_len), GFP_NOFS);

	if (!cb)

		return -ENOMEM;

	atomic_set(&cb->pending_bios, 0);
@@ -398,12 +396,11 @@ int btrfs_submit_compressed_write(struct inode *inode, u64 start, 
			BUG_ON(ret); /* -ENOMEM */



			if (!skip_sum) {

				ret = btrfs_csum_one_bio(root, inode, bio,

							 start, 1);

				ret = btrfs_csum_one_bio(inode, bio, start, 1);

				BUG_ON(ret); /* -ENOMEM */

			}



			ret = btrfs_map_bio(root, bio, 0, 1);

			ret = btrfs_map_bio(fs_info, bio, 0, 1);

			if (ret) {

				bio->bi_error = ret;

				bio_endio(bio);
@@ -433,11 +430,11 @@ int btrfs_submit_compressed_write(struct inode *inode, u64 start, 
	BUG_ON(ret); /* -ENOMEM */



	if (!skip_sum) {

		ret = btrfs_csum_one_bio(root, inode, bio, start, 1);

		ret = btrfs_csum_one_bio(inode, bio, start, 1);

		BUG_ON(ret); /* -ENOMEM */

	}



	ret = btrfs_map_bio(root, bio, 0, 1);

	ret = btrfs_map_bio(fs_info, bio, 0, 1);

	if (ret) {

		bio->bi_error = ret;

		bio_endio(bio);
@@ -581,7 +578,6 @@ int btrfs_submit_compressed_read(struct inode *inode, struct bio *bio, 
	struct extent_io_tree *tree;

	struct extent_map_tree *em_tree;

	struct compressed_bio *cb;

	struct btrfs_root *root = BTRFS_I(inode)->root;

	unsigned long compressed_len;

	unsigned long nr_pages;

	unsigned long pg_index;
@@ -609,7 +605,7 @@ int btrfs_submit_compressed_read(struct inode *inode, struct bio *bio, 
		return -EIO;



	compressed_len = em->block_len;

	cb = kmalloc(compressed_bio_size(root, compressed_len), GFP_NOFS);

	cb = kmalloc(compressed_bio_size(fs_info, compressed_len), GFP_NOFS);

	if (!cb)

		goto out;
@@ -694,14 +690,14 @@ int btrfs_submit_compressed_read(struct inode *inode, struct bio *bio, 
			atomic_inc(&cb->pending_bios);



			if (!(BTRFS_I(inode)->flags & BTRFS_INODE_NODATASUM)) {

				ret = btrfs_lookup_bio_sums(root, inode,

							comp_bio, sums);

				ret = btrfs_lookup_bio_sums(inode, comp_bio,

							    sums);

				BUG_ON(ret); /* -ENOMEM */

			}

			sums += DIV_ROUND_UP(comp_bio->bi_iter.bi_size,

					     fs_info->sectorsize);



			ret = btrfs_map_bio(root, comp_bio, mirror_num, 0);

			ret = btrfs_map_bio(fs_info, comp_bio, mirror_num, 0);

			if (ret) {

				comp_bio->bi_error = ret;

				bio_endio(comp_bio);
@@ -726,11 +722,11 @@ int btrfs_submit_compressed_read(struct inode *inode, struct bio *bio, 
	BUG_ON(ret); /* -ENOMEM */



	if (!(BTRFS_I(inode)->flags & BTRFS_INODE_NODATASUM)) {

		ret = btrfs_lookup_bio_sums(root, inode, comp_bio, sums);

		ret = btrfs_lookup_bio_sums(inode, comp_bio, sums);

		BUG_ON(ret); /* -ENOMEM */

	}



	ret = btrfs_map_bio(root, comp_bio, mirror_num, 0);

	ret = btrfs_map_bio(fs_info, comp_bio, mirror_num, 0);

	if (ret) {

		comp_bio->bi_error = ret;

		bio_endio(comp_bio);

fs/btrfs/ctree.c

+114 −117

File changed.

Preview size limit exceeded, changes collapsed.