UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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: Jeff Mahoney <jeffm@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
Jeff Mahoney 2016-06-22 18:56:18 -04:00 committed by David Sterba
parent fb456252d3
commit f15376df0d
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fs/btrfs/ctree.h
View File

@ -519,7 +519,7 @@ struct btrfs_io_ctl {
void *cur, *orig; void *cur, *orig;
struct page *page; struct page *page;
struct page **pages; struct page **pages;
struct btrfs_root *root; struct btrfs_fs_info *fs_info;
struct inode *inode; struct inode *inode;
unsigned long size; unsigned long size;
int index; int index;

12
fs/btrfs/free-space-cache.c
View File

@ -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, 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 num_pages;
int check_crcs = 0; int check_crcs = 0;
@ -325,7 +325,7 @@ static int io_ctl_init(struct btrfs_io_ctl *io_ctl, struct inode *inode,
return -ENOMEM; return -ENOMEM;
io_ctl->num_pages = num_pages; 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->check_crcs = check_crcs;
io_ctl->inode = inode; 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; gen = io_ctl->cur;
if (le64_to_cpu(*gen) != generation) { 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)", "space cache generation (%llu) does not match inode (%llu)",
*gen, generation); *gen, generation);
io_ctl_unmap_page(io_ctl); 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); PAGE_SIZE - offset);
btrfs_csum_final(crc, (u8 *)&crc); btrfs_csum_final(crc, (u8 *)&crc);
if (val != 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"); "csum mismatch on free space cache");
io_ctl_unmap_page(io_ctl); io_ctl_unmap_page(io_ctl);
return -EIO; return -EIO;
@ -722,7 +722,7 @@ static int __load_free_space_cache(struct btrfs_root *root, struct inode *inode,
if (!num_entries) if (!num_entries)
return 0; return 0;
ret = io_ctl_init(&io_ctl, inode, root, 0); ret = io_ctl_init(&io_ctl, inode, 0);
if (ret) if (ret)
return ret; return ret;
@ -1229,7 +1229,7 @@ static int __btrfs_write_out_cache(struct btrfs_root *root, struct inode *inode,
return -EIO; return -EIO;
WARN_ON(io_ctl->pages); WARN_ON(io_ctl->pages);
ret = io_ctl_init(io_ctl, inode, root, 1); ret = io_ctl_init(io_ctl, inode, 1);
if (ret) if (ret)
return ret; return ret;