diff options
| author | Mark Fasheh <mfasheh@suse.com> | 2011-07-12 10:46:06 -0700 |
|---|---|---|
| committer | Mark Fasheh <mfasheh@suse.com> | 2011-07-14 14:14:44 -0700 |
| commit | 1e5063d093b5f024ae35bf835ca07463de2c1a1f (patch) | |
| tree | c3d5f934e5db6e7169231ce4a7456a31a5eadb28 /fs | |
| parent | d8926bb3badd36670fecf2de4a062c78bc37430b (diff) | |
| download | linux-1e5063d093b5f024ae35bf835ca07463de2c1a1f.tar.gz linux-1e5063d093b5f024ae35bf835ca07463de2c1a1f.tar.bz2 linux-1e5063d093b5f024ae35bf835ca07463de2c1a1f.zip | |
btrfs: Don't BUG_ON alloc_path errors in replay_one_buffer()
The two ->process_func call sites in tree-log.c which were ignoring a return
code have also been updated to gracefully exit as well.
Signed-off-by: Mark Fasheh <mfasheh@suse.com>
Diffstat (limited to 'fs')
| -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 4ce8a9f41d1e..f3cacc079102 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; |