diff options
| author | Chris Mason <clm@fb.com> | 2015-01-21 20:49:35 -0500 |
|---|---|---|
| committer | Chris Mason <clm@fb.com> | 2015-01-21 20:49:35 -0500 |
| commit | 57bbddd7fbf468336940d18a4c68a8678163acb0 (patch) | |
| tree | 5d9c5ecf6ba145cdaf369e0c6ddfc4ea88ce8dd9 /fs/btrfs/tree-log.c | |
| parent | d3541834884f042aaaab1d6c0610cdc3488028e4 (diff) | |
| parent | ce3e69847e3ec79a38421bfd3d6f554d5e481231 (diff) | |
Merge branch 'cleanup/blocksize-diet-part2' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux into for-linus
Diffstat (limited to 'fs/btrfs/tree-log.c')
| -rw-r--r-- | fs/btrfs/tree-log.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/btrfs/tree-log.c b/fs/btrfs/tree-log.c index 25a1c363a5f4..67e5bf709dca 100644 --- a/fs/btrfs/tree-log.c +++ b/fs/btrfs/tree-log.c | |||
| @@ -2165,7 +2165,7 @@ static noinline int walk_down_log_tree(struct btrfs_trans_handle *trans, | |||
| 2165 | parent = path->nodes[*level]; | 2165 | parent = path->nodes[*level]; |
| 2166 | root_owner = btrfs_header_owner(parent); | 2166 | root_owner = btrfs_header_owner(parent); |
| 2167 | 2167 | ||
| 2168 | next = btrfs_find_create_tree_block(root, bytenr, blocksize); | 2168 | next = btrfs_find_create_tree_block(root, bytenr); |
| 2169 | if (!next) | 2169 | if (!next) |
| 2170 | return -ENOMEM; | 2170 | return -ENOMEM; |
| 2171 | 2171 | ||