---

yaml --- r: 232995 b: refs/heads/master c: 34d19ba h: refs/heads/master i: 232993: 232bb35 232991: d7f98b9 v: v3
git-mirror · Jan 28, 2011 · f3ad06f · f3ad06f
1 parent f14b4c2
commit f3ad06f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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);