diff options
author | Stefan Behrens <sbehrens@giantdisaster.de> | 2012-11-05 09:46:42 -0500 |
---|---|---|
committer | Josef Bacik <jbacik@fusionio.com> | 2012-12-12 17:15:34 -0500 |
commit | 3ec706c831d4c96905c287013c8228b21619a1d9 (patch) | |
tree | b5f8ac6333bd0d54b87f4d367aaf3d6101eeef5b /fs/btrfs/extent-tree.c | |
parent | 5d9640517d92d05843711ea982cbeff42d7ed32d (diff) |
Btrfs: pass fs_info to btrfs_map_block() instead of mapping_tree
This is required for the device replace procedure in a later step.
Two calling functions also had to be changed to have the fs_info
pointer: repair_io_failure() and scrub_setup_recheck_block().
Signed-off-by: Stefan Behrens <sbehrens@giantdisaster.de>
Signed-off-by: Chris Mason <chris.mason@fusionio.com>
Diffstat (limited to 'fs/btrfs/extent-tree.c')
-rw-r--r-- | fs/btrfs/extent-tree.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c index f8a358aee060..b4d438f6c2b3 100644 --- a/fs/btrfs/extent-tree.c +++ b/fs/btrfs/extent-tree.c | |||
@@ -1818,7 +1818,7 @@ static int btrfs_discard_extent(struct btrfs_root *root, u64 bytenr, | |||
1818 | 1818 | ||
1819 | 1819 | ||
1820 | /* Tell the block device(s) that the sectors can be discarded */ | 1820 | /* Tell the block device(s) that the sectors can be discarded */ |
1821 | ret = btrfs_map_block(&root->fs_info->mapping_tree, REQ_DISCARD, | 1821 | ret = btrfs_map_block(root->fs_info, REQ_DISCARD, |
1822 | bytenr, &num_bytes, &bbio, 0); | 1822 | bytenr, &num_bytes, &bbio, 0); |
1823 | /* Error condition is -ENOMEM */ | 1823 | /* Error condition is -ENOMEM */ |
1824 | if (!ret) { | 1824 | if (!ret) { |