diff --git a/[refs] b/[refs]
index 364863608442..03071deecdba 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5d80366e9b5e56b3ffc1923b4995e83bbbf605e3
+refs/heads/master: 4a7d0f6854c4a4ad1dba00a3b128a32d39b9a742
diff --git a/trunk/fs/btrfs/inode.c b/trunk/fs/btrfs/inode.c
index cf26778085e0..16925807a9ed 100644
--- a/trunk/fs/btrfs/inode.c
+++ b/trunk/fs/btrfs/inode.c
@@ -2538,6 +2538,8 @@ int btrfs_orphan_cleanup(struct btrfs_root *root)
 				goto out;
 
 			ret = btrfs_truncate(inode);
+			if (ret)
+				btrfs_orphan_del(NULL, inode);
 		} else {
 			nr_unlink++;
 		}