From 0b5c8f8a4efa94d3fe11ba7f774e021bf64adf70 Mon Sep 17 00:00:00 2001
From: Jim Meyering <meyering@redhat.com>
Date: Wed, 1 Oct 2008 19:09:04 -0400
Subject: [PATCH] --- yaml --- r: 128965 b: refs/heads/master c:
 0463bb4e8d2f717a9bf3be6cc12c0aec51cc261d h: refs/heads/master i:   128963:
 423c544db35639e526dd7495b49cf35ee52a5dd5 v: v3

---
 [refs]                   | 2 +-
 trunk/fs/btrfs/disk-io.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 7f7886a7de2a..752e9fcaba9a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 75ccf47d13bfb66de7faf596bfe497b9af7aaa40
+refs/heads/master: 0463bb4e8d2f717a9bf3be6cc12c0aec51cc261d
diff --git a/trunk/fs/btrfs/disk-io.c b/trunk/fs/btrfs/disk-io.c
index 5ee10d3136f5..41b7d24d07e2 100644
--- a/trunk/fs/btrfs/disk-io.c
+++ b/trunk/fs/btrfs/disk-io.c
@@ -1371,7 +1371,8 @@ struct btrfs_root *open_ctree(struct super_block *sb,
 
 	struct btrfs_super_block *disk_super;
 
-	if (!extent_root || !tree_root || !fs_info) {
+	if (!extent_root || !tree_root || !fs_info ||
+	    !chunk_root || !dev_root) {
 		err = -ENOMEM;
 		goto fail;
 	}