From: Kern Sibbald <kern@sibbald.com>
Date: Sat, 31 Jul 2010 20:01:32 +0000 (+0200)
Subject: Revert to old block.c to fix recycling
X-Git-Tag: Release-7.0.0~1645
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=71f047494389e44da92ef8391169148f7ce36de2;p=bacula%2Fbacula

Revert to old block.c to fix recycling
---

diff --git a/bacula/src/stored/block.c b/bacula/src/stored/block.c
index f23d666dec..8bde1b609d 100644
--- a/bacula/src/stored/block.c
+++ b/bacula/src/stored/block.c
@@ -381,9 +381,6 @@ bool write_block_to_device(DCR *dcr)
 
    if (!write_block_to_dev(dcr)) {
        if (job_canceled(jcr) || jcr->getJobType() == JT_SYSTEM) {
-          if (jcr->getJobType() != JT_SYSTEM) {
-             terminate_writing_volume(dcr);
-          }
           stat = false;
        } else {
           stat = fixup_device_block_write_error(dcr);
@@ -419,7 +416,6 @@ bool write_block_to_dev(DCR *dcr)
    return true;
 #endif
    if (job_canceled(jcr)) {
-      terminate_writing_volume(dcr);
       return false;
    }
 
@@ -734,10 +730,6 @@ static bool terminate_writing_volume(DCR *dcr)
    DEVICE *dev = dcr->dev;
    bool ok = true;
 
-   if (dev->at_eot()) {
-      return true;
-  }
-
    /* Create a JobMedia record to indicated end of tape */
    dev->VolCatInfo.VolCatFiles = dev->file;
    if (!dir_create_jobmedia_record(dcr)) {