Skip to content

Commit

Permalink
Btrfs: handle kzalloc() failure in open_ctree()
Browse files Browse the repository at this point in the history
Unwind and return -ENOMEM if the allocation fails here.

Signed-off-by: Dan Carpenter <[email protected]>
Signed-off-by: Chris Mason <[email protected]>
  • Loading branch information
error27 authored and chrismason-xx committed Jun 11, 2010
1 parent fb4f6f9 commit 676e4c8
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions fs/btrfs/disk-io.c
Original file line number Diff line number Diff line change
Expand Up @@ -1941,8 +1941,11 @@ struct btrfs_root *open_ctree(struct super_block *sb,
btrfs_level_size(tree_root,
btrfs_super_log_root_level(disk_super));

log_tree_root = kzalloc(sizeof(struct btrfs_root),
GFP_NOFS);
log_tree_root = kzalloc(sizeof(struct btrfs_root), GFP_NOFS);
if (!log_tree_root) {
err = -ENOMEM;
goto fail_trans_kthread;
}

__setup_root(nodesize, leafsize, sectorsize, stripesize,
log_tree_root, fs_info, BTRFS_TREE_LOG_OBJECTID);
Expand Down

0 comments on commit 676e4c8

Please sign in to comment.