diff options
| author | Josef Bacik <jbacik@fusionio.com> | 2013-04-24 16:40:05 -0400 |
|---|---|---|
| committer | Josef Bacik <jbacik@fusionio.com> | 2013-05-06 15:55:10 -0400 |
| commit | abefa55ac1f8cb8fb8cb4d7e8d619dc0859181ab (patch) | |
| tree | 7d5a5e7d51ad174efbaf46559e14a9eb8bd21cce /fs | |
| parent | 32b0253803bf8e384a37a70f2dfffb2056e7d087 (diff) | |
| download | talos-obmc-linux-abefa55ac1f8cb8fb8cb4d7e8d619dc0859181ab.tar.gz talos-obmc-linux-abefa55ac1f8cb8fb8cb4d7e8d619dc0859181ab.zip | |
Btrfs: check return value of commit when recovering log
We need to check the return value of the commit in case something goes wrong,
otherwise we could end up going down the line and doing more stuff (like orphan
cleanup) before we notice we should have errored out. We need to do this before
we free up the log_tree_root since the caller will handle all of that. Thanks,
Signed-off-by: Josef Bacik <jbacik@fusionio.com>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/btrfs/tree-log.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/fs/btrfs/tree-log.c b/fs/btrfs/tree-log.c index 1fdc221a9c0b..f50137a98fb1 100644 --- a/fs/btrfs/tree-log.c +++ b/fs/btrfs/tree-log.c @@ -4012,16 +4012,17 @@ again: btrfs_free_path(path); + /* step 4: commit the transaction, which also unpins the blocks */ + ret = btrfs_commit_transaction(trans, fs_info->tree_root); + if (ret) + return ret; + free_extent_buffer(log_root_tree->node); log_root_tree->log_root = NULL; fs_info->log_root_recovering = 0; - - /* step 4: commit the transaction, which also unpins the blocks */ - btrfs_commit_transaction(trans, fs_info->tree_root); - kfree(log_root_tree); - return 0; + return 0; error: btrfs_free_path(path); return ret; |
