From: Josef Bacik <jbacik@fusionio.com>
Date: Tue, 4 Jun 2013 01:39:49 +0000 (-0400)
Subject: Btrfs: put our inode if orphan cleanup fails
X-Git-Tag: Ubuntu-snapdragon-4.4.0-1050.54~12162^2~31
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=01cd33674e95296e1647da3534b9aef1e98556b5;p=mirror_ubuntu-artful-kernel.git

Btrfs: put our inode if orphan cleanup fails

When we cross into a different subvol when doing a lookup we will run the orhpan
cleanup.  If this fails however we do not drop the ref to the inode we were
looking up before we return an error, which leads to busy inodes on umount.
Thanks,

Signed-off-by: Josef Bacik <jbacik@fusionio.com>
---

diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index c52ceb8c24e0..a2df4690b000 100644
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -4941,8 +4941,10 @@ struct inode *btrfs_lookup_dentry(struct inode *dir, struct dentry *dentry)
 		if (!(inode->i_sb->s_flags & MS_RDONLY))
 			ret = btrfs_orphan_cleanup(sub_root);
 		up_read(&root->fs_info->cleanup_work_sem);
-		if (ret)
+		if (ret) {
+			iput(inode);
 			inode = ERR_PTR(ret);
+		}
 	}
 
 	return inode;