aboutsummaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
Diffstat (limited to 'fs')
-rw-r--r--fs/btrfs/disk-io.c11
1 files changed, 0 insertions, 11 deletions
diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c
index 81f3433fe4fd..d84667379f01 100644
--- a/fs/btrfs/disk-io.c
+++ b/fs/btrfs/disk-io.c
@@ -465,13 +465,10 @@ static int btree_read_extent_buffer_pages(struct btrfs_root *root,
465 465
466static int csum_dirty_buffer(struct btrfs_root *root, struct page *page) 466static int csum_dirty_buffer(struct btrfs_root *root, struct page *page)
467{ 467{
468 struct extent_io_tree *tree;
469 u64 start = page_offset(page); 468 u64 start = page_offset(page);
470 u64 found_start; 469 u64 found_start;
471 struct extent_buffer *eb; 470 struct extent_buffer *eb;
472 471
473 tree = &BTRFS_I(page->mapping->host)->io_tree;
474
475 eb = (struct extent_buffer *)page->private; 472 eb = (struct extent_buffer *)page->private;
476 if (page != eb->pages[0]) 473 if (page != eb->pages[0])
477 return 0; 474 return 0;
@@ -570,7 +567,6 @@ static int btree_readpage_end_io_hook(struct btrfs_io_bio *io_bio,
570 u64 phy_offset, struct page *page, 567 u64 phy_offset, struct page *page,
571 u64 start, u64 end, int mirror) 568 u64 start, u64 end, int mirror)
572{ 569{
573 struct extent_io_tree *tree;
574 u64 found_start; 570 u64 found_start;
575 int found_level; 571 int found_level;
576 struct extent_buffer *eb; 572 struct extent_buffer *eb;
@@ -581,7 +577,6 @@ static int btree_readpage_end_io_hook(struct btrfs_io_bio *io_bio,
581 if (!page->private) 577 if (!page->private)
582 goto out; 578 goto out;
583 579
584 tree = &BTRFS_I(page->mapping->host)->io_tree;
585 eb = (struct extent_buffer *)page->private; 580 eb = (struct extent_buffer *)page->private;
586 581
587 /* the pending IO might have been the only thing that kept this buffer 582 /* the pending IO might have been the only thing that kept this buffer
@@ -968,11 +963,9 @@ static int btree_migratepage(struct address_space *mapping,
968static int btree_writepages(struct address_space *mapping, 963static int btree_writepages(struct address_space *mapping,
969 struct writeback_control *wbc) 964 struct writeback_control *wbc)
970{ 965{
971 struct extent_io_tree *tree;
972 struct btrfs_fs_info *fs_info; 966 struct btrfs_fs_info *fs_info;
973 int ret; 967 int ret;
974 968
975 tree = &BTRFS_I(mapping->host)->io_tree;
976 if (wbc->sync_mode == WB_SYNC_NONE) { 969 if (wbc->sync_mode == WB_SYNC_NONE) {
977 970
978 if (wbc->for_kupdate) 971 if (wbc->for_kupdate)
@@ -1274,7 +1267,6 @@ struct btrfs_root *btrfs_create_tree(struct btrfs_trans_handle *trans,
1274 struct btrfs_root *root; 1267 struct btrfs_root *root;
1275 struct btrfs_key key; 1268 struct btrfs_key key;
1276 int ret = 0; 1269 int ret = 0;
1277 u64 bytenr;
1278 uuid_le uuid; 1270 uuid_le uuid;
1279 1271
1280 root = btrfs_alloc_root(fs_info); 1272 root = btrfs_alloc_root(fs_info);
@@ -1296,7 +1288,6 @@ struct btrfs_root *btrfs_create_tree(struct btrfs_trans_handle *trans,
1296 goto fail; 1288 goto fail;
1297 } 1289 }
1298 1290
1299 bytenr = leaf->start;
1300 memset_extent_buffer(leaf, 0, 0, sizeof(struct btrfs_header)); 1291 memset_extent_buffer(leaf, 0, 0, sizeof(struct btrfs_header));
1301 btrfs_set_header_bytenr(leaf, leaf->start); 1292 btrfs_set_header_bytenr(leaf, leaf->start);
1302 btrfs_set_header_generation(leaf, trans->transid); 1293 btrfs_set_header_generation(leaf, trans->transid);
@@ -1685,12 +1676,10 @@ static void end_workqueue_fn(struct btrfs_work *work)
1685{ 1676{
1686 struct bio *bio; 1677 struct bio *bio;
1687 struct end_io_wq *end_io_wq; 1678 struct end_io_wq *end_io_wq;
1688 struct btrfs_fs_info *fs_info;
1689 int error; 1679 int error;
1690 1680
1691 end_io_wq = container_of(work, struct end_io_wq, work); 1681 end_io_wq = container_of(work, struct end_io_wq, work);
1692 bio = end_io_wq->bio; 1682 bio = end_io_wq->bio;
1693 fs_info = end_io_wq->info;
1694 1683
1695 error = end_io_wq->error; 1684 error = end_io_wq->error;
1696 bio->bi_private = end_io_wq->private; 1685 bio->bi_private = end_io_wq->private;