diff options
| author | Mark Brown <broonie@linaro.org> | 2013-09-27 14:27:56 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-09-27 14:27:56 +0100 |
| commit | 0cab71e7014dc73a84e1d14d9b02e39c48241580 (patch) | |
| tree | 17b25202f70b62d43bca6bdf6ca9dc61f3daf0aa /fs/btrfs/dev-replace.c | |
| parent | 7d5f880b46f222ff83a76fd36b01f5a59bf32122 (diff) | |
| parent | 3e2bd64d243ff0f3dc08c49ff218fed42ee9d981 (diff) | |
Merge remote-tracking branch 'spi/fix/s3c64xx' into spi-s3c64xx
Conflicts:
drivers/spi/spi-s3c64xx.c
Diffstat (limited to 'fs/btrfs/dev-replace.c')
| -rw-r--r-- | fs/btrfs/dev-replace.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/btrfs/dev-replace.c b/fs/btrfs/dev-replace.c index a6443535938..70681686e8d 100644 --- a/fs/btrfs/dev-replace.c +++ b/fs/btrfs/dev-replace.c @@ -400,7 +400,7 @@ int btrfs_dev_replace_start(struct btrfs_root *root, args->result = BTRFS_IOCTL_DEV_REPLACE_RESULT_NO_ERROR; btrfs_dev_replace_unlock(dev_replace); - btrfs_wait_all_ordered_extents(root->fs_info, 0); + btrfs_wait_all_ordered_extents(root->fs_info); /* force writing the updated state information to disk */ trans = btrfs_start_transaction(root, 0); @@ -475,7 +475,7 @@ static int btrfs_dev_replace_finishing(struct btrfs_fs_info *fs_info, mutex_unlock(&dev_replace->lock_finishing_cancel_unmount); return ret; } - btrfs_wait_all_ordered_extents(root->fs_info, 0); + btrfs_wait_all_ordered_extents(root->fs_info); trans = btrfs_start_transaction(root, 0); if (IS_ERR(trans)) { |