diff options
| author | Dan Carpenter <error27@gmail.com> | 2010-05-29 09:43:07 +0000 |
|---|---|---|
| committer | Chris Mason <chris.mason@oracle.com> | 2010-06-11 15:57:34 -0400 |
| commit | 676e4c86391936795c82ccd11ca9671ee6307936 (patch) | |
| tree | b39173542a91c008d54d1acf6463b874793accee | |
| parent | fb4f6f910ca6f58564c31a680ef88940d8192713 (diff) | |
| download | op-kernel-dev-676e4c86391936795c82ccd11ca9671ee6307936.zip op-kernel-dev-676e4c86391936795c82ccd11ca9671ee6307936.tar.gz | |
Btrfs: handle kzalloc() failure in open_ctree()
Unwind and return -ENOMEM if the allocation fails here.
Signed-off-by: Dan Carpenter <error27@gmail.com>
Signed-off-by: Chris Mason <chris.mason@oracle.com>
| -rw-r--r-- | fs/btrfs/disk-io.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c index f3b287c..73895ba 100644 --- a/fs/btrfs/disk-io.c +++ b/fs/btrfs/disk-io.c @@ -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); |
