diff --git a/[refs] b/[refs] index 634e2f74c4da..e8d2d1d1a95c 100644 --- 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 index bc3c92466045..ad3cd8614d29 100644 --- 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)