dae6dc6e91
From a comment on the bug: This is a regression caused by rewriting the duplicate checking code to be more aggressive when looking for duplicates when using tail-end packing. In particular a file doesn't now have to be the same size to be considered a (partial) duplicate.
31 lines
1.4 KiB
Diff
31 lines
1.4 KiB
Diff
diff --git a/squashfs-tools/mksquashfs.c b/squashfs-tools/mksquashfs.c
|
|
index aaa4b002bd87..127df00fb789 100644
|
|
--- a/squashfs-tools/mksquashfs.c
|
|
+++ b/squashfs-tools/mksquashfs.c
|
|
@@ -2190,10 +2190,23 @@ static struct file_info *duplicate(int *dupf, int *block_dup, long long file_siz
|
|
/* Yes, the block list matches. We can use this, rather
|
|
* than writing an identical block list.
|
|
* If both it and us doesn't have a tail-end fragment, then we're
|
|
- * finished. Return the duplicate */
|
|
+ * finished. Return the duplicate.
|
|
+ *
|
|
+ * We have to deal with the special case where the
|
|
+ * last block is a sparse block. This means the
|
|
+ * file will have matched, but, it may be a different
|
|
+ * file length (because a tail-end sparse block may be
|
|
+ * anything from 1 byte to block_size - 1 in size, but
|
|
+ * stored as zero). We can still use the block list in
|
|
+ * this case, but, we must return a new entry with the
|
|
+ * correct file size */
|
|
if(!frag_bytes && !dupl_ptr->fragment->size) {
|
|
*dupf = *block_dup = TRUE;
|
|
- return dupl_ptr;
|
|
+ if(file_size == dupl_ptr->file_size)
|
|
+ return dupl_ptr;
|
|
+ else
|
|
+ return create_non_dup(file_size, bytes, blocks, sparse, dupl_ptr->block_list,
|
|
+ dupl_ptr->start, dupl_ptr->fragment, checksum, 0, checksum_flag, FALSE);
|
|
}
|
|
|
|
/* We've got a tail-end fragment, and this file most likely
|