---

yaml --- r: 377086 b: refs/heads/master c: 6379ef9 h: refs/heads/master v: v3
git-mirror · Jun 8, 2013 · d684b60 · d684b60
1 parent 5aff339
commit d684b60
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7b5ff90ed081787ec0765ceb4fe5ccf5677493a6
+refs/heads/master: 6379ef9fb2482a92b5fe09f927d6ce1f989c0c6d
diff --git a/trunk/fs/btrfs/inode.c b/trunk/fs/btrfs/inode.c
@@ -8011,6 +8011,9 @@ int btrfs_drop_inode(struct inode *inode)
 {
 	struct btrfs_root *root = BTRFS_I(inode)->root;
 
+	if (root == NULL)
+		return 1;
+
 	/* the snap/subvol tree is on deleting */
 	if (btrfs_root_refs(&root->root_item) == 0 &&
 	    root != root->fs_info->tree_root)