---

yaml --- r: 243148 b: refs/heads/master c: ded5db9 h: refs/heads/master v: v3
git-mirror · Mar 17, 2011 · 09693cc · 09693cc
1 parent 8f6c8d4
commit 09693cc
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 66b4ffd110f9b48b8d8c1319ee446b53b8d073bf
+refs/heads/master: ded5db9de78f963979e1605f859de67626f54693
diff --git a/trunk/fs/btrfs/inode.c b/trunk/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);