diff options
| author | Chris Mason <chris.mason@oracle.com> | 2011-08-01 22:27:34 +0400 |
|---|---|---|
| committer | Chris Mason <chris.mason@oracle.com> | 2011-08-01 22:27:34 +0400 |
| commit | b43b31bdf2e662006c27cc4dcccf863312d62bc1 (patch) | |
| tree | 9e12413edbd9d7a77e4c0b692dd28ca4ae5039bd /fs/btrfs/tree-log.c | |
| parent | ff95acb6733d41a8d45feb0e18b96df25e610e78 (diff) | |
| parent | 38a1a919535742af677303271eb4ff731547b706 (diff) | |
| download | linux-b43b31bdf2e662006c27cc4dcccf863312d62bc1.tar.xz | |
Merge branch 'alloc_path' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/btrfs-error-handling into for-linus
Diffstat (limited to 'fs/btrfs/tree-log.c')
| -rw-r--r-- | fs/btrfs/tree-log.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/fs/btrfs/tree-log.c b/fs/btrfs/tree-log.c index ac278dd83175..babee65f8eda 100644 --- a/fs/btrfs/tree-log.c +++ b/fs/btrfs/tree-log.c @@ -1617,7 +1617,8 @@ static int replay_one_buffer(struct btrfs_root *log, struct extent_buffer *eb, return 0; path = btrfs_alloc_path(); - BUG_ON(!path); + if (!path) + return -ENOMEM; nritems = btrfs_header_nritems(eb); for (i = 0; i < nritems; i++) { @@ -1723,7 +1724,9 @@ static noinline int walk_down_log_tree(struct btrfs_trans_handle *trans, return -ENOMEM; if (*level == 1) { - wc->process_func(root, next, wc, ptr_gen); + ret = wc->process_func(root, next, wc, ptr_gen); + if (ret) + return ret; path->slots[*level]++; if (wc->free) { @@ -1788,8 +1791,11 @@ static noinline int walk_up_log_tree(struct btrfs_trans_handle *trans, parent = path->nodes[*level + 1]; root_owner = btrfs_header_owner(parent); - wc->process_func(root, path->nodes[*level], wc, + ret = wc->process_func(root, path->nodes[*level], wc, btrfs_header_generation(path->nodes[*level])); + if (ret) + return ret; + if (wc->free) { struct extent_buffer *next; |