From ae7b1b98f78be48564983472d7db626cae4db53a Mon Sep 17 00:00:00 2001 From: Dan Carpenter Date: Sat, 29 May 2010 09:43:07 +0000 Subject: [PATCH] --- yaml --- r: 200357 b: refs/heads/master c: 676e4c86391936795c82ccd11ca9671ee6307936 h: refs/heads/master i: 200355: d0d7d0b34eebcbe06966d48a91f9198b95adbd86 v: v3 --- [refs] | 2 +- trunk/fs/btrfs/disk-io.c | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 42c02bc36be7..0e063de1fb79 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fb4f6f910ca6f58564c31a680ef88940d8192713 +refs/heads/master: 676e4c86391936795c82ccd11ca9671ee6307936 diff --git a/trunk/fs/btrfs/disk-io.c b/trunk/fs/btrfs/disk-io.c index f3b287c22caf..73895baf6e07 100644 --- a/trunk/fs/btrfs/disk-io.c +++ b/trunk/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);