diff options
| author | Chris Mason <clm@fb.com> | 2016-06-17 13:04:57 -0400 |
|---|---|---|
| committer | Chris Mason <clm@fb.com> | 2016-06-17 13:04:57 -0400 |
| commit | de18c165509edb36bde42ca6ff930854f85e21ea (patch) | |
| tree | 0e2bedc70d8b60958fb49fcb3392e95efacf39eb /fs/btrfs/tree-log.c | |
| parent | 719da39a61173c849f70656ed1a302e4b6deaa5b (diff) | |
| parent | dd5c93111dc9d26e038ac437f7a403d617e82c62 (diff) | |
Merge branch 'for-chris' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux into for-linus-4.7
Diffstat (limited to 'fs/btrfs/tree-log.c')
| -rw-r--r-- | fs/btrfs/tree-log.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/btrfs/tree-log.c b/fs/btrfs/tree-log.c index aa8fed11f749..8ab1dc64cbba 100644 --- a/fs/btrfs/tree-log.c +++ b/fs/btrfs/tree-log.c | |||
| @@ -2422,8 +2422,8 @@ static noinline int walk_down_log_tree(struct btrfs_trans_handle *trans, | |||
| 2422 | root_owner = btrfs_header_owner(parent); | 2422 | root_owner = btrfs_header_owner(parent); |
| 2423 | 2423 | ||
| 2424 | next = btrfs_find_create_tree_block(root, bytenr); | 2424 | next = btrfs_find_create_tree_block(root, bytenr); |
| 2425 | if (!next) | 2425 | if (IS_ERR(next)) |
| 2426 | return -ENOMEM; | 2426 | return PTR_ERR(next); |
| 2427 | 2427 | ||
| 2428 | if (*level == 1) { | 2428 | if (*level == 1) { |
| 2429 | ret = wc->process_func(root, next, wc, ptr_gen); | 2429 | ret = wc->process_func(root, next, wc, ptr_gen); |