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

Commit Message

Josef Bacik March 4, 2011, 7:11 p.m. UTC

None

Patch

diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index 69df7c8..7a5bb9e 100644
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -6587,6 +6587,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);