ebl cleanup

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@8144 91ce42f0-d328-0410-95d8-f526ca767f89

diff --git a/bacula/patches/testing/find_smallest_volfile.patch b/bacula/patches/testing/find_smallest_volfile.patch
index 39e2e43da6c933f864ef2735cb56994faf89ee80..71c7f56b85dc5e9579072c81a1052825f5186baf 100644 (file)
--- a/bacula/patches/testing/find_smallest_volfile.patch
+++ b/bacula/patches/testing/find_smallest_volfile.patch
@@ -108,57 +108,3 @@ Index: match_bsr.c
     return return_bsr;
  }
  
-@@ -607,14 +636,6 @@
- 
- static int match_volblock(BSR *bsr, BSR_VOLBLOCK *volblock, DEV_RECORD *rec, bool done)
- {
--   /*
--    * Currently block matching does not work correctly for disk
--    * files in all cases, so it is "turned off" by the following 
--    * return statement.
--    */
--   return 1;
--
--
-    if (!volblock) {
-       return 1;                       /* no specification matches all */
-    }
-Index: read_record.c
-===================================================================
---- read_record.c      (révision 8116)
-+++ read_record.c      (copie de travail)
-@@ -160,7 +160,6 @@
-          }
-       }
-       Dmsg2(dbglvl, "Read new block at pos=%u:%u\n", dev->file, dev->block_num);
--#ifdef if_and_when_FAST_BLOCK_REJECTION_is_working
-       /* this does not stop when file/block are too big */
-       if (!match_bsr_block(jcr->bsr, block)) {
-          if (try_repositioning(jcr, rec, dcr)) {
-@@ -168,7 +167,6 @@
-          }
-          continue;                    /* skip this record */
-       }
--#endif
- 
-       /*
-        * Get a new record for each Job as defined by
-@@ -338,6 +336,7 @@
-       rec->Block = 0;
-       return true;
-    }
-+   Dmsg1(dbglvl, "try_repositioning bsr=0x%p\n", bsr);
-    if (bsr) {
-       /*
-        * ***FIXME*** gross kludge to make disk seeking work.  Remove
-@@ -345,7 +344,9 @@
-        *   completed.
-        */
-       if (dev->file > bsr->volfile->sfile ||             
--         (dev->file == bsr->volfile->sfile && dev->block_num > bsr->volblock->sblock)) {
-+          (dev->file == bsr->volfile->sfile && dev->block_num > bsr->volblock->sblock)) {
-+         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);
-+         Dmsg6(dbglvl, "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);
-          return false;
-       }
-       if (verbose) {