Hello community, here is the log from the commit of package duperemove for openSUSE:Factory checked in at 2016-10-02 00:09:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/duperemove (Old) and /work/SRC/openSUSE:Factory/.duperemove.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "duperemove" Changes: -------- --- /work/SRC/openSUSE:Factory/duperemove/duperemove.changes 2016-09-30 15:33:46.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.duperemove.new/duperemove.changes 2016-10-02 00:09:26.000000000 +0200 @@ -1,0 +2,8 @@ +Fri Sep 30 20:05:02 UTC 2016 - m...@fasheh.com + +- Update to v0.11.beta4 git commit f95e429 + * Use proper len of tail blocks during block dedupe + * run_dedupe: avoid size_list corruption in push_blocks() + - Added patch: v0.11.beta4_to_git_f95e429.patch + +------------------------------------------------------------------- New: ---- v0.11.beta4_to_git_f95e429.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ duperemove.spec ++++++ --- /var/tmp/diff_new_pack.Hshouv/_old 2016-10-02 00:09:27.000000000 +0200 +++ /var/tmp/diff_new_pack.Hshouv/_new 2016-10-02 00:09:27.000000000 +0200 @@ -25,6 +25,7 @@ Group: System/Filesystems Url: https://github.com/markfasheh/duperemove Source: https://github.com/markfasheh/%{name}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz +Patch1: v0.11.beta4_to_git_f95e429.patch BuildRequires: gcc-c++ BuildRequires: pkg-config BuildRequires: pkgconfig(glib-2.0) @@ -45,6 +46,7 @@ %prep %setup -q +%patch1 -p1 %build %if 0%{?suse_version} <= 1200 ++++++ v0.11.beta4_to_git_f95e429.patch ++++++ f95e429 Use proper len of tail blocks during block dedupe 02f5a09 run_dedupe: avoid size_list corruption in push_blocks() diff --git a/hash-tree.c b/hash-tree.c index 82a48d1..9ab9482 100644 --- a/hash-tree.c +++ b/hash-tree.c @@ -353,6 +353,7 @@ int remove_hashed_block(struct hash_tree *tree, if (head && list_empty(&head->h_blocks)) free_one_hash_head(blocklist, head); + abort_on(blocklist->dl_num_elem == 0); blocklist->dl_num_elem--; if (blocklist->dl_num_elem == 0) { rb_erase(&blocklist->dl_node, &tree->root); diff --git a/run_dedupe.c b/run_dedupe.c index b219201..5c344c5 100644 --- a/run_dedupe.c +++ b/run_dedupe.c @@ -512,7 +512,7 @@ static void free_bdl(struct block_dedupe_list *bdl); static int __block_dedupe(struct block_dedupe_list *bdl, struct results_tree *res, struct filerec *tgt_file, - uint64_t tgt_off, + uint64_t tgt_off, uint64_t tgt_len, uint64_t *fiemap_bytes, uint64_t *kern_bytes, unsigned long long passno) { @@ -523,7 +523,7 @@ static int __block_dedupe(struct block_dedupe_list *bdl, if (tgt_file) { /* Insert this first so it gets picked as target. */ ret = insert_one_result(res, bdl->bd_hash, tgt_file, tgt_off, - blocksize); + tgt_len); if (ret) return ret; @@ -548,7 +548,7 @@ static int __block_dedupe(struct block_dedupe_list *bdl, } ret = insert_one_result(res, bdl->bd_hash, block->b_file, - block->b_loff, blocksize); + block->b_loff, block_len(block)); if (ret) goto out; } @@ -587,21 +587,24 @@ out: */ static void pick_target_files(struct block_dedupe_list *bdl, struct filerec **tgt1, uint64_t *loff1, - struct filerec **tgt2, uint64_t *loff2) + uint64_t *tlen1, struct filerec **tgt2, + uint64_t *loff2, uint64_t *tlen2) { struct filerec *file1, *file2; - uint64_t off1, off2; + uint64_t off1, off2, len1, len2; struct file_block *block; file1 = file2 = NULL; - off1 = off2 = 0; + off1 = off2 = len1 = len2 = 0; list_for_each_entry(block, &bdl->bd_block_list, b_list) { if (!file1) { file1 = block->b_file; off1 = block->b_loff; + len1 = block_len(block); } else if (file1 != block->b_file) { file2 = block->b_file; off2 = block->b_loff; + len2 = block_len(block); } if (file1 && file2) @@ -612,6 +615,8 @@ static void pick_target_files(struct block_dedupe_list *bdl, *tgt2 = file2; *loff1 = off1; *loff2 = off2; + *tlen1 = len1; + *tlen2 = len2; return; } @@ -622,11 +627,12 @@ static int block_dedupe_nosame(struct block_dedupe_list *bdl, { int ret; struct filerec *tgt_file1, *tgt_file2; - uint64_t tgt_off1, tgt_off2; + uint64_t tgt_off1, tgt_off2, tgt_len1, tgt_len2; tgt_off1 = tgt_off2 = 0; - pick_target_files(bdl, &tgt_file1, &tgt_off1, &tgt_file2, &tgt_off2); + pick_target_files(bdl, &tgt_file1, &tgt_off1, &tgt_len1, + &tgt_file2, &tgt_off2, &tgt_len2); if (!tgt_file2) { /* Can't dedupe this in nosame mode */ @@ -639,10 +645,10 @@ static int block_dedupe_nosame(struct block_dedupe_list *bdl, return 0; } - ret = __block_dedupe(bdl, res, tgt_file1, tgt_off1, fiemap_bytes, - kern_bytes, passno); + ret = __block_dedupe(bdl, res, tgt_file1, tgt_off1, tgt_len1, + fiemap_bytes, kern_bytes, passno); if (!ret) - ret = __block_dedupe(bdl, res, tgt_file2, tgt_off2, + ret = __block_dedupe(bdl, res, tgt_file2, tgt_off2, tgt_len2, fiemap_bytes, kern_bytes, passno); return ret; @@ -661,7 +667,7 @@ static int block_dedupe_worker(struct block_dedupe_list *bdl, ret = block_dedupe_nosame(bdl, &res, fiemap_bytes, kern_bytes, passno); else - ret = __block_dedupe(bdl, &res, NULL, 0, fiemap_bytes, + ret = __block_dedupe(bdl, &res, NULL, 0, 0, fiemap_bytes, kern_bytes, passno); free_bdl(bdl); return ret; @@ -814,11 +820,17 @@ out: static int push_blocks(struct hash_tree *hashes) { - struct dupe_blocks_list *dups; + struct dupe_blocks_list *dups, *tmp; - list_for_each_entry(dups, &hashes->size_list, dl_size_list) { + list_for_each_entry_safe(dups, tmp, &hashes->size_list, dl_size_list) { if (dups->dl_num_elem < 2) continue; + /* + * Do this here because we don't want one of the + * worker threads removing it from the size list for + * us when they free the dups structure. + */ + list_del_init(&dups->dl_size_list); if (__push_blocks(hashes, dups)) return 1;
