aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--fs/btrfs/ctree.h2
-rw-r--r--fs/btrfs/free-space-cache.c12
2 files changed, 7 insertions, 7 deletions
diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h
index 9a3ca798087f..15ff880bf4b5 100644
--- a/fs/btrfs/ctree.h
+++ b/fs/btrfs/ctree.h
@@ -519,7 +519,7 @@ struct btrfs_io_ctl {
519 void *cur, *orig; 519 void *cur, *orig;
520 struct page *page; 520 struct page *page;
521 struct page **pages; 521 struct page **pages;
522 struct btrfs_root *root; 522 struct btrfs_fs_info *fs_info;
523 struct inode *inode; 523 struct inode *inode;
524 unsigned long size; 524 unsigned long size;
525 int index; 525 int index;
diff --git a/fs/btrfs/free-space-cache.c b/fs/btrfs/free-space-cache.c
index a538133aec63..d2320eef1a44 100644
--- a/fs/btrfs/free-space-cache.c
+++ b/fs/btrfs/free-space-cache.c
@@ -303,7 +303,7 @@ static int readahead_cache(struct inode *inode)
303} 303}
304 304
305static int io_ctl_init(struct btrfs_io_ctl *io_ctl, struct inode *inode, 305static int io_ctl_init(struct btrfs_io_ctl *io_ctl, struct inode *inode,
306 struct btrfs_root *root, int write) 306 int write)
307{ 307{
308 int num_pages; 308 int num_pages;
309 int check_crcs = 0; 309 int check_crcs = 0;
@@ -325,7 +325,7 @@ static int io_ctl_init(struct btrfs_io_ctl *io_ctl, struct inode *inode,
325 return -ENOMEM; 325 return -ENOMEM;
326 326
327 io_ctl->num_pages = num_pages; 327 io_ctl->num_pages = num_pages;
328 io_ctl->root = root; 328 io_ctl->fs_info = btrfs_sb(inode->i_sb);
329 io_ctl->check_crcs = check_crcs; 329 io_ctl->check_crcs = check_crcs;
330 io_ctl->inode = inode; 330 io_ctl->inode = inode;
331 331
@@ -448,7 +448,7 @@ static int io_ctl_check_generation(struct btrfs_io_ctl *io_ctl, u64 generation)
448 448
449 gen = io_ctl->cur; 449 gen = io_ctl->cur;
450 if (le64_to_cpu(*gen) != generation) { 450 if (le64_to_cpu(*gen) != generation) {
451 btrfs_err_rl(io_ctl->root->fs_info, 451 btrfs_err_rl(io_ctl->fs_info,
452 "space cache generation (%llu) does not match inode (%llu)", 452 "space cache generation (%llu) does not match inode (%llu)",
453 *gen, generation); 453 *gen, generation);
454 io_ctl_unmap_page(io_ctl); 454 io_ctl_unmap_page(io_ctl);
@@ -504,7 +504,7 @@ static int io_ctl_check_crc(struct btrfs_io_ctl *io_ctl, int index)
504 PAGE_SIZE - offset); 504 PAGE_SIZE - offset);
505 btrfs_csum_final(crc, (u8 *)&crc); 505 btrfs_csum_final(crc, (u8 *)&crc);
506 if (val != crc) { 506 if (val != crc) {
507 btrfs_err_rl(io_ctl->root->fs_info, 507 btrfs_err_rl(io_ctl->fs_info,
508 "csum mismatch on free space cache"); 508 "csum mismatch on free space cache");
509 io_ctl_unmap_page(io_ctl); 509 io_ctl_unmap_page(io_ctl);
510 return -EIO; 510 return -EIO;
@@ -722,7 +722,7 @@ static int __load_free_space_cache(struct btrfs_root *root, struct inode *inode,
722 if (!num_entries) 722 if (!num_entries)
723 return 0; 723 return 0;
724 724
725 ret = io_ctl_init(&io_ctl, inode, root, 0); 725 ret = io_ctl_init(&io_ctl, inode, 0);
726 if (ret) 726 if (ret)
727 return ret; 727 return ret;
728 728
@@ -1229,7 +1229,7 @@ static int __btrfs_write_out_cache(struct btrfs_root *root, struct inode *inode,
1229 return -EIO; 1229 return -EIO;
1230 1230
1231 WARN_ON(io_ctl->pages); 1231 WARN_ON(io_ctl->pages);
1232 ret = io_ctl_init(io_ctl, inode, root, 1); 1232 ret = io_ctl_init(io_ctl, inode, 1);
1233 if (ret) 1233 if (ret)
1234 return ret; 1234 return ret;
1235 1235