From d684b60a887fbfb152eb25f5368dce6119e751fb Mon Sep 17 00:00:00 2001
From: Naohiro Aota <naota@elisp.net>
Date: Thu, 6 Jun 2013 09:56:34 +0000
Subject: [PATCH] --- yaml --- r: 377086 b: refs/heads/master c:
 6379ef9fb2482a92b5fe09f927d6ce1f989c0c6d h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index cb1f66a80625..70bf2e98289d 100644
--- 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
index 23c596cd1b98..c931a4dbd031 100644
--- 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)