diff options
author | Miao Xie <miaox@cn.fujitsu.com> | 2013-01-22 05:49:33 -0500 |
---|---|---|
committer | Josef Bacik <jbacik@fusionio.com> | 2013-02-20 09:37:21 -0500 |
commit | 3edb2a68cb23cd6ca84022421eeae2604722cdc4 (patch) | |
tree | c6755d624d37cc02672e1aa47ab3d9c80d160576 | |
parent | e6ec716f0ddbe51741ef261d0804f0c28038dda4 (diff) |
Btrfs: check the return value of btrfs_start_delalloc_inodes()
We forget to check the return value of btrfs_start_delalloc_inodes(), fix it.
Signed-off-by: Miao Xie <miaox@cn.fujitsu.com>
Signed-off-by: Josef Bacik <jbacik@fusionio.com>
-rw-r--r-- | fs/btrfs/dev-replace.c | 6 | ||||
-rw-r--r-- | fs/btrfs/transaction.c | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/fs/btrfs/dev-replace.c b/fs/btrfs/dev-replace.c index 66dbc8dbddf7..7ba7b3900cb8 100644 --- a/fs/btrfs/dev-replace.c +++ b/fs/btrfs/dev-replace.c | |||
@@ -465,7 +465,11 @@ static int btrfs_dev_replace_finishing(struct btrfs_fs_info *fs_info, | |||
465 | * flush all outstanding I/O and inode extent mappings before the | 465 | * flush all outstanding I/O and inode extent mappings before the |
466 | * copy operation is declared as being finished | 466 | * copy operation is declared as being finished |
467 | */ | 467 | */ |
468 | btrfs_start_delalloc_inodes(root, 0); | 468 | ret = btrfs_start_delalloc_inodes(root, 0); |
469 | if (ret) { | ||
470 | mutex_unlock(&dev_replace->lock_finishing_cancel_unmount); | ||
471 | return ret; | ||
472 | } | ||
469 | btrfs_wait_ordered_extents(root, 0); | 473 | btrfs_wait_ordered_extents(root, 0); |
470 | 474 | ||
471 | trans = btrfs_start_transaction(root, 0); | 475 | trans = btrfs_start_transaction(root, 0); |
diff --git a/fs/btrfs/transaction.c b/fs/btrfs/transaction.c index 24fde97cba81..42dac27207ab 100644 --- a/fs/btrfs/transaction.c +++ b/fs/btrfs/transaction.c | |||
@@ -1427,7 +1427,9 @@ static int btrfs_flush_all_pending_stuffs(struct btrfs_trans_handle *trans, | |||
1427 | } | 1427 | } |
1428 | 1428 | ||
1429 | if (flush_on_commit || snap_pending) { | 1429 | if (flush_on_commit || snap_pending) { |
1430 | btrfs_start_delalloc_inodes(root, 1); | 1430 | ret = btrfs_start_delalloc_inodes(root, 1); |
1431 | if (ret) | ||
1432 | return ret; | ||
1431 | btrfs_wait_ordered_extents(root, 1); | 1433 | btrfs_wait_ordered_extents(root, 1); |
1432 | } | 1434 | } |
1433 | 1435 | ||