From: Josef Bacik <josef@redhat.com>
Date: Fri, 4 Mar 2011 19:09:46 +0000 (-0500)
Subject: Btrfs: make sure to remove the orphan item from the in-memory list
X-Git-Tag: v2.6.39-rc2~6^2~46
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ded5db9de78f963979e1605f859de67626f54693;p=profile%2Fivi%2Fkernel-x86-ivi.git

Btrfs: make sure to remove the orphan item from the in-memory list

This fixes a problem where if truncate fails the inode will still be on the in
memory orphan list.  This is will make us complain when the inode gets destroyed
because it's still on the orphan list.  So if we fail just remove us from the in
memory list and carry on.

Signed-off-by: Josef Bacik <josef@redhat.com>
---

diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index 0600265..3bd0ff6 100644
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -6589,6 +6589,12 @@ static int btrfs_truncate(struct inode *inode)
 		ret = btrfs_orphan_del(trans, inode);
 		if (ret)
 			err = ret;
+	} else if (ret && inode->i_nlink > 0) {
+		/*
+		 * Failed to do the truncate, remove us from the in memory
+		 * orphan list.
+		 */
+		ret = btrfs_orphan_del(NULL, inode);
 	}
 
 	ret = btrfs_update_inode(trans, root, inode);