From 2a3a5d382f4c81bdcb52000123b16fc5e6697b51 Mon Sep 17 00:00:00 2001
From: Chris Mason <chris.mason@oracle.com>
Date: Thu, 28 Aug 2008 06:15:25 -0400
Subject: [PATCH] --- yaml --- r: 128919 b: refs/heads/master c:
 639cb58675ce9b507eed9c3d6b3335488079b21a h: refs/heads/master i:   128917:
 4e3fab0cbf99c2458b9aaa1caa9fca4558f5b9ff   128915:
 10fbf9364f6050ddbff22e96575af7cb0670e3bf   128911:
 7d03e932aef48d81982e4078abfc4898bf669723 v: v3

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

diff --git a/[refs] b/[refs]
index 4638a00a5614..681987b9f234 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9473f16c75606fe6b2e5000525fe9766114505f3
+refs/heads/master: 639cb58675ce9b507eed9c3d6b3335488079b21a
diff --git a/trunk/fs/btrfs/file-item.c b/trunk/fs/btrfs/file-item.c
index f861bd506928..6dbe88b9d7d4 100644
--- a/trunk/fs/btrfs/file-item.c
+++ b/trunk/fs/btrfs/file-item.c
@@ -325,6 +325,7 @@ int btrfs_csum_file_blocks(struct btrfs_trans_handle *trans,
 	item = btrfs_lookup_csum(trans, root, path, objectid, offset, 1);
 	if (!IS_ERR(item)) {
 		leaf = path->nodes[0];
+		ret = 0;
 		goto found;
 	}
 	ret = PTR_ERR(item);