Skip to content

Commit

Permalink
btrfs: root->fs_info cleanup, io_ctl_init
Browse files Browse the repository at this point in the history
The io_ctl->root member was only being used to access root->fs_info.

Signed-off-by: Jeff Mahoney <jeffm@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
  • Loading branch information
Jeff Mahoney authored and David Sterba committed Dec 6, 2016
1 parent fb45625 commit f15376d
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion fs/btrfs/ctree.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
12 changes: 6 additions & 6 deletions fs/btrfs/free-space-cache.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;

Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;

Expand Down Expand Up @@ -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;

Expand Down

0 comments on commit f15376d

Please sign in to comment.