summaryrefslogtreecommitdiffstats
path: root/fs/btrfs/disk-io.c
diff options
context:
space:
mode:
authorStefan Behrens <sbehrens@giantdisaster.de>2012-11-05 17:03:39 +0100
committerJosef Bacik <jbacik@fusionio.com>2012-12-12 17:15:36 -0500
commitaa1b8cd409f05e1489ec77ff219eff6ed4b801b8 (patch)
tree92d091da518c2c9b141b5649663a7aa9c0d5624c /fs/btrfs/disk-io.c
parenta8a6dab77997a371f1925a4001021eea3ee5cb88 (diff)
downloadlinux-aa1b8cd409f05e1489ec77ff219eff6ed4b801b8.tar.gz
linux-aa1b8cd409f05e1489ec77ff219eff6ed4b801b8.tar.bz2
linux-aa1b8cd409f05e1489ec77ff219eff6ed4b801b8.zip
Btrfs: pass fs_info instead of root
A small number of functions that are used in a device replace procedure when the operation is resumed at mount time are unable to pass the same root pointer that would be used in the regular (ioctl) context. And since the root pointer is not required, only the fs_info is, the root pointer argument is replaced with the fs_info pointer argument. Signed-off-by: Stefan Behrens <sbehrens@giantdisaster.de> Signed-off-by: Chris Mason <chris.mason@fusionio.com>
Diffstat (limited to 'fs/btrfs/disk-io.c')
-rw-r--r--fs/btrfs/disk-io.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c
index ba2b931fd8f6..42a8024e935f 100644
--- a/fs/btrfs/disk-io.c
+++ b/fs/btrfs/disk-io.c
@@ -3283,9 +3283,9 @@ int close_ctree(struct btrfs_root *root)
smp_mb();
/* pause restriper - we want to resume on mount */
- btrfs_pause_balance(root->fs_info);
+ btrfs_pause_balance(fs_info);
- btrfs_scrub_cancel(root);
+ btrfs_scrub_cancel(fs_info);
/* wait for any defraggers to finish */
wait_event(fs_info->transaction_wait,