---

yaml --- r: 374831 b: refs/heads/master c: 628c828 h: refs/heads/master i: 374829: fd7b296 374827: b0204d3 374823: a72ed4b 374815: 48f155b v: v3
git-mirror · May 6, 2013 · 8f999d9 · 8f999d9
1 parent 1759ca7
commit 8f999d9
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7abadb6431a057f1e3cf8d395acb8766b947ac85
+refs/heads/master: 628c8282bed73c18ff056d655d4a6a63ef55284a
diff --git a/trunk/fs/btrfs/file-item.c b/trunk/fs/btrfs/file-item.c
@@ -358,11 +358,8 @@ int btrfs_lookup_csums_range(struct btrfs_root *root, u64 start, u64 end,
 
 		btrfs_item_key_to_cpu(leaf, &key, path->slots[0]);
 		if (key.objectid != BTRFS_EXTENT_CSUM_OBJECTID ||
-		    key.type != BTRFS_EXTENT_CSUM_KEY)
-			break;
-
-		btrfs_item_key_to_cpu(leaf, &key, path->slots[0]);
-		if (key.offset > end)
+		    key.type != BTRFS_EXTENT_CSUM_KEY ||
+		    key.offset > end)
 			break;
 
 		if (key.offset > start)