aboutsummaryrefslogtreecommitdiffstats
path: root/fs/btrfs/disk-io.c
diff options
context:
space:
mode:
authorJeff Mahoney <jeffm@suse.com>2016-06-22 18:54:23 -0400
committerDavid Sterba <dsterba@suse.com>2016-12-06 10:06:59 -0500
commitccdf9b305a49875d49dbaec6f8d2440abb0b1994 (patch)
tree0b1ac124531f45ba7e7997bc89572165cb774a43 /fs/btrfs/disk-io.c
parent0b246afa62b0cf5b09d078121f543135f28492ad (diff)
btrfs: root->fs_info cleanup, access fs_info->delayed_root directly
This results in btrfs_assert_delayed_root_empty and btrfs_destroy_delayed_inode taking an fs_info instead of a root. Signed-off-by: Jeff Mahoney <jeffm@suse.com> Signed-off-by: David Sterba <dsterba@suse.com>
Diffstat (limited to 'fs/btrfs/disk-io.c')
-rw-r--r--fs/btrfs/disk-io.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c
index 02ba794d171e..5f7d283933b4 100644
--- a/fs/btrfs/disk-io.c
+++ b/fs/btrfs/disk-io.c
@@ -4587,8 +4587,8 @@ void btrfs_cleanup_one_transaction(struct btrfs_transaction *cur_trans,
4587 cur_trans->state = TRANS_STATE_UNBLOCKED; 4587 cur_trans->state = TRANS_STATE_UNBLOCKED;
4588 wake_up(&fs_info->transaction_wait); 4588 wake_up(&fs_info->transaction_wait);
4589 4589
4590 btrfs_destroy_delayed_inodes(root); 4590 btrfs_destroy_delayed_inodes(fs_info);
4591 btrfs_assert_delayed_root_empty(root); 4591 btrfs_assert_delayed_root_empty(fs_info);
4592 4592
4593 btrfs_destroy_marked_extents(root, &cur_trans->dirty_pages, 4593 btrfs_destroy_marked_extents(root, &cur_trans->dirty_pages,
4594 EXTENT_DIRTY); 4594 EXTENT_DIRTY);
@@ -4649,8 +4649,8 @@ static int btrfs_cleanup_transaction(struct btrfs_root *root)
4649 } 4649 }
4650 spin_unlock(&fs_info->trans_lock); 4650 spin_unlock(&fs_info->trans_lock);
4651 btrfs_destroy_all_ordered_extents(fs_info); 4651 btrfs_destroy_all_ordered_extents(fs_info);
4652 btrfs_destroy_delayed_inodes(root); 4652 btrfs_destroy_delayed_inodes(fs_info);
4653 btrfs_assert_delayed_root_empty(root); 4653 btrfs_assert_delayed_root_empty(fs_info);
4654 btrfs_destroy_pinned_extent(root, fs_info->pinned_extents); 4654 btrfs_destroy_pinned_extent(root, fs_info->pinned_extents);
4655 btrfs_destroy_all_delalloc_inodes(fs_info); 4655 btrfs_destroy_all_delalloc_inodes(fs_info);
4656 mutex_unlock(&fs_info->transaction_kthread_mutex); 4656 mutex_unlock(&fs_info->transaction_kthread_mutex);