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);