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

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

btrfs: root->fs_info cleanup, io_ctl_init 



The io_ctl->root member was only being used to access root->fs_info.

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

fs/btrfs/ctree.h

+1 −1
Original line number Diff line number Diff line
@@ -519,7 +519,7 @@ struct btrfs_io_ctl { 
	void *cur, *orig;

	struct page *page;

	struct page **pages;

	struct btrfs_root *root;

	struct btrfs_fs_info *fs_info;

	struct inode *inode;

	unsigned long size;

	int index;

fs/btrfs/free-space-cache.c

+6 −6
Original line number Diff line number Diff line
@@ -303,7 +303,7 @@ static int readahead_cache(struct inode *inode) 
}



static int io_ctl_init(struct btrfs_io_ctl *io_ctl, struct inode *inode,

		       struct btrfs_root *root, int write)

		       int write)

{

	int num_pages;

	int check_crcs = 0;
@@ -325,7 +325,7 @@ static int io_ctl_init(struct btrfs_io_ctl *io_ctl, struct inode *inode, 
		return -ENOMEM;



	io_ctl->num_pages = num_pages;

	io_ctl->root = root;

	io_ctl->fs_info = btrfs_sb(inode->i_sb);

	io_ctl->check_crcs = check_crcs;

	io_ctl->inode = inode;
@@ -448,7 +448,7 @@ static int io_ctl_check_generation(struct btrfs_io_ctl *io_ctl, u64 generation) 


	gen = io_ctl->cur;

	if (le64_to_cpu(*gen) != generation) {

		btrfs_err_rl(io_ctl->root->fs_info,

		btrfs_err_rl(io_ctl->fs_info,

			"space cache generation (%llu) does not match inode (%llu)",

				*gen, generation);

		io_ctl_unmap_page(io_ctl);
@@ -504,7 +504,7 @@ static int io_ctl_check_crc(struct btrfs_io_ctl *io_ctl, int index) 
			      PAGE_SIZE - offset);

	btrfs_csum_final(crc, (u8 *)&crc);

	if (val != crc) {

		btrfs_err_rl(io_ctl->root->fs_info,

		btrfs_err_rl(io_ctl->fs_info,

			"csum mismatch on free space cache");

		io_ctl_unmap_page(io_ctl);

		return -EIO;
@@ -722,7 +722,7 @@ static int __load_free_space_cache(struct btrfs_root *root, struct inode *inode, 
	if (!num_entries)

		return 0;



	ret = io_ctl_init(&io_ctl, inode, root, 0);

	ret = io_ctl_init(&io_ctl, inode, 0);

	if (ret)

		return ret;
@@ -1229,7 +1229,7 @@ static int __btrfs_write_out_cache(struct btrfs_root *root, struct inode *inode, 
		return -EIO;



	WARN_ON(io_ctl->pages);

	ret = io_ctl_init(io_ctl, inode, root, 1);

	ret = io_ctl_init(io_ctl, inode, 1);

	if (ret)

		return ret;