---

yaml --- r: 200356 b: refs/heads/master c: fb4f6f9 h: refs/heads/master v: v3
git-mirror · Jun 11, 2010 · c44cbc1 · c44cbc1
1 parent d0d7d0b
commit c44cbc1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git 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
@@ -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