This commit was manufactured by cvs2svn to create tag

[bacula/bacula] / bacula / src / stored / device.c

diff --git a/bacula/src/stored/device.c b/bacula/src/stored/device.c
index 0a3c945604060b8b2bf05acda9be95d74ca4a5e9..c7407d5d2411f51102022158da453041b51a5cbe 100644 (file)
--- a/bacula/src/stored/device.c
+++ b/bacula/src/stored/device.c
@@ -73,7 +73,6 @@ extern int debug_level;
  */
 bool fixup_device_block_write_error(DCR *dcr)
 {
-   uint32_t stat;
    char PrevVolName[MAX_NAME_LENGTH];
    DEV_BLOCK *label_blk;
    DEV_BLOCK *block = dcr->block;
@@ -84,12 +83,8 @@ bool fixup_device_block_write_error(DCR *dcr)
    DEVICE *dev = dcr->dev;
 
    wait_time = time(NULL);
-   stat = status_dev(dev);
-   if (!(stat & BMT_EOD)) {
-      return false;                    /* this really shouldn't happen */
-   }
 
-   Dmsg0(100, "======= Got EOD ========\n");
+   Dmsg0(100, "Enter fixup_device_block_write_error\n");
 
    block_device(dev, BST_DOING_ACQUIRE);
    /* Unlock, but leave BLOCKED */
@@ -141,8 +136,7 @@ bool fixup_device_block_write_error(DCR *dcr)
    /*
     * Walk through all attached jcrs indicating the volume has changed
     */
-   Dmsg1(100, "Walk attached jcrs. Volume=%s\n", dev->VolCatInfo.VolCatName);
-// for (JCR *mjcr=NULL; (mjcr=next_attached_jcr(dev, mjcr)); ) {
+   Dmsg1(100, "Walk attached dcrs. Volume=%s\n", dev->VolCatInfo.VolCatName);
    DCR *mdcr;
    foreach_dlist(mdcr, dev->attached_dcrs) {
       JCR *mjcr = mdcr->jcr;
@@ -268,7 +262,6 @@ bool first_open_device(DCR *dcr)
        mode = OPEN_READ_ONLY;
     }
    Dmsg0(129, "Opening device.\n");
-   dev->open_nowait = true;
    if (dev->open(dcr, mode) < 0) {
       Emsg1(M_FATAL, 0, _("dev open failed: %s\n"), dev->errmsg);
       ok = false;
@@ -277,7 +270,6 @@ bool first_open_device(DCR *dcr)
    Dmsg1(129, "open dev %s OK\n", dev->print_name());
 
 bail_out:
-   dev->open_nowait = false;
    unlock_device(dev);
    return ok;
 }
@@ -321,7 +313,6 @@ void close_device(DEVICE *dev)
 }
 
 /*
- * Used when unmounting the device, ignore use_count
  */
 void force_close_device(DEVICE *dev)
 {
@@ -329,12 +320,8 @@ void force_close_device(DEVICE *dev)
       return;
    }
    Dmsg1(29, "Force close_dev %s\n", dev->print_name());
-   dev->use_count = 1;
+   free_volume(dev);
    dev->close();
-
-#ifdef FULL_DEBUG
-   ASSERT(dev->use_count >= 0);
-#endif
 }
 
 
@@ -459,7 +446,6 @@ void _give_back_device_lock(const char *file, int line, DEVICE *dev, bsteal_lock
    dev->no_wait_id = hold->no_wait_id;
    Dmsg1(400, "return lock. new=%s\n", dev->print_blocked());
    if (dev->num_waiting > 0) {
-      Dmsg0(400, "Broadcast\n");
       pthread_cond_broadcast(&dev->wait); /* wake them up */
    }
 }