---

yaml --- r: 309902 b: refs/heads/master c: 5bdbeb2 h: refs/heads/master v: v3
git-mirror · May 30, 2012 · ba2afb7 · ba2afb7
1 parent 09d5272
commit ba2afb7
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: 22ee6985de7d3e81ec0cef9c6ba01b45ad1bafeb
+refs/heads/master: 5bdbeb2187a99d690b374a8c5ec9911fcbcfe739
diff --git 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;
 }