From ba2afb722cffddfc084b2070629568a1ecf70eef Mon Sep 17 00:00:00 2001
From: Josef Bacik <josef@redhat.com>
Date: Tue, 29 May 2012 16:59:49 -0400
Subject: [PATCH] --- yaml --- r: 309902 b: refs/heads/master c:
 5bdbeb2187a99d690b374a8c5ec9911fcbcfe739 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index cebe0fe207f7..1d5751670ce6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 22ee6985de7d3e81ec0cef9c6ba01b45ad1bafeb
+refs/heads/master: 5bdbeb2187a99d690b374a8c5ec9911fcbcfe739
diff --git a/trunk/fs/btrfs/tree-log.c b/trunk/fs/btrfs/tree-log.c
index 425014bdc6ac..2017d0ff511c 100644
--- a/trunk/fs/btrfs/tree-log.c
+++ b/trunk/fs/btrfs/tree-log.c
@@ -2667,6 +2667,8 @@ static int drop_objectid_items(struct btrfs_trans_handle *trans,
 		btrfs_release_path(path);
 	}
 	btrfs_release_path(path);
+	if (ret > 0)
+		ret = 0;
 	return ret;
 }