1 Index: src/stored/match_bsr.c
2 ===================================================================
3 --- src/stored/match_bsr.c (révision 8116)
4 +++ src/stored/match_bsr.c (copie de travail)
9 + Dmsg1(dbglevel, "find_smallest_volfile done=%i\n", return_bsr->done);
15 static int match_volblock(BSR *bsr, BSR_VOLBLOCK *volblock, DEV_RECORD *rec, bool done)
18 - * Currently block matching does not work correctly for disk
19 - * files in all cases, so it is "turned off" by the following
26 return 1; /* no specification matches all */
28 Index: src/stored/read_record.c
29 ===================================================================
30 --- src/stored/read_record.c (révision 8116)
31 +++ src/stored/read_record.c (copie de travail)
35 Dmsg2(dbglvl, "Read new block at pos=%u:%u\n", dev->file, dev->block_num);
36 -#ifdef if_and_when_FAST_BLOCK_REJECTION_is_working
37 /* this does not stop when file/block are too big */
38 if (!match_bsr_block(jcr->bsr, block)) {
39 if (try_repositioning(jcr, rec, dcr)) {
42 continue; /* skip this record */
47 * Get a new record for each Job as defined by
52 + Dmsg1(dbglvl, "try_repositioning bsr=0x%p\n", bsr);
55 * ***FIXME*** gross kludge to make disk seeking work. Remove
59 if (dev->file > bsr->volfile->sfile ||
60 - (dev->file == bsr->volfile->sfile && dev->block_num > bsr->volblock->sblock)) {
62 + (dev->file == bsr->volfile->sfile && dev->block_num > bsr->volblock->sblock)) {
63 + Jmsg(jcr, M_ERROR, 0, "Will read back to the media!!! %i > %i || (%i == %i && %i > %i)\n", dev->file, bsr->volfile->sfile, dev->file, bsr->volfile->sfile, dev->block_num, bsr->volblock->sblock);
66 Jmsg(jcr, M_INFO, 0, _("Reposition from (file:block) %u:%u to %u:%u\n"),