---

yaml --- r: 374853 b: refs/heads/master c: d4e3991 h: refs/heads/master i: 374851: ecfedec v: v3
git-mirror · May 6, 2013 · ff54a57 · ff54a57
1 parent 51c718d
commit ff54a57
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f63e0cca9174dd8b47380f61565ab7b921d6ac2c
+refs/heads/master: d4e3991b9945906528c7abb627d759ea43f53bce
diff --git a/trunk/fs/btrfs/inode.c b/trunk/fs/btrfs/inode.c
@@ -3616,6 +3616,8 @@ static int __btrfs_unlink_inode(struct btrfs_trans_handle *trans,
 					   dir, index);
 	if (ret == -ENOENT)
 		ret = 0;
+	else if (ret)
+		btrfs_abort_transaction(trans, root, ret);
 err:
 	btrfs_free_path(path);
 	if (ret)