From ff54a57a3a065bf4831cc8f029882217e8067c50 Mon Sep 17 00:00:00 2001
From: Zach Brown <zab@redhat.com>
Date: Tue, 2 Apr 2013 21:02:16 +0000
Subject: [PATCH] --- yaml --- r: 374853 b: refs/heads/master c:
 d4e3991b9945906528c7abb627d759ea43f53bce h: refs/heads/master i:   374851:
 ecfedecc3608ad9998ffc87d5e97cef727da7ff2 v: v3

---
 [refs]                 | 2 +-
 trunk/fs/btrfs/inode.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index d8f252f9d7ce..39008346fbe1 100644
--- 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
index c41637a1ed38..ca4051713633 100644
--- 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)