From c44cbc13288ea7118ba805ed8d4f25bc94f23b4c Mon Sep 17 00:00:00 2001
From: Dan Carpenter <error27@gmail.com>
Date: Sat, 29 May 2010 09:40:57 +0000
Subject: [PATCH] --- yaml --- r: 200356 b: refs/heads/master c:
 fb4f6f910ca6f58564c31a680ef88940d8192713 h: refs/heads/master v: v3

---
 [refs]                 | 2 +-
 trunk/fs/btrfs/super.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index ef7cc21b7d2d..42c02bc36be7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3bf84a5a834d13e7c5c3e8e5b5c6b26012118dd8
+refs/heads/master: fb4f6f910ca6f58564c31a680ef88940d8192713
diff --git a/trunk/fs/btrfs/super.c b/trunk/fs/btrfs/super.c
index 574285c8cbd4..9ea711430466 100644
--- a/trunk/fs/btrfs/super.c
+++ b/trunk/fs/btrfs/super.c
@@ -360,6 +360,8 @@ static struct dentry *get_default_root(struct super_block *sb,
 	 */
 	dir_id = btrfs_super_root_dir(&root->fs_info->super_copy);
 	di = btrfs_lookup_dir_item(NULL, root, path, dir_id, "default", 7, 0);
+	if (IS_ERR(di))
+		return ERR_CAST(di);
 	if (!di) {
 		/*
 		 * Ok the default dir item isn't there.  This is weird since