From f3ad06fcf8e65405d102ffcbdd6fc00bad49e069 Mon Sep 17 00:00:00 2001
From: Julia Lawall <julia@diku.dk>
Date: Mon, 24 Jan 2011 19:55:19 +0000
Subject: [PATCH] --- yaml --- r: 232995 b: refs/heads/master c:
 34d19bada00f4825588b338a8ee193820f9ceeb0 h: refs/heads/master i:   232993:
 232bb35434711e06ca7324b84acab9ba2b4d041f   232991:
 d7f98b907603bcbf35738ce0a7327e4f36ea6fff v: v3

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

diff --git a/[refs] b/[refs]
index 562212ba9d39..bced08af29a5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 333e8105445d4f51101fc3d23199a919d66730b3
+refs/heads/master: 34d19bada00f4825588b338a8ee193820f9ceeb0
diff --git a/trunk/fs/btrfs/inode.c b/trunk/fs/btrfs/inode.c
index 2c9a2f7d5631..2b7d251d6ad1 100644
--- a/trunk/fs/btrfs/inode.c
+++ b/trunk/fs/btrfs/inode.c
@@ -4137,7 +4137,7 @@ struct inode *btrfs_lookup_dentry(struct inode *dir, struct dentry *dentry)
 	}
 	srcu_read_unlock(&root->fs_info->subvol_srcu, index);
 
-	if (root != sub_root) {
+	if (!IS_ERR(inode) && root != sub_root) {
 		down_read(&root->fs_info->cleanup_work_sem);
 		if (!(inode->i_sb->s_flags & MS_RDONLY))
 			btrfs_orphan_cleanup(sub_root);