Update doc, default working directory bscan

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

diff --git a/bacula/src/stored/mount.c b/bacula/src/stored/mount.c
index 4594c72d12c71fbd8edfee2168f2a2d5c171a93f..88de341080095c5692525e2ca3ec6f3f78303478 100644 (file)
--- a/bacula/src/stored/mount.c
+++ b/bacula/src/stored/mount.c
@@ -66,9 +66,8 @@ mount_next_vol:
       /* 
        * First erase all memory of the current volume  
        */
-      dev->block_num = 0;
-      dev->file = 0;
-      dev->LastBlockNumWritten = 0;
+      dev->block_num = dev->file = 0;
+      dev->EndBlock = dev->EndFile = 0;
       memset(&dev->VolCatInfo, 0, sizeof(dev->VolCatInfo));
       memset(&jcr->VolCatInfo, 0, sizeof(jcr->VolCatInfo));
       memset(&dev->VolHdr, 0, sizeof(dev->VolHdr));
@@ -249,7 +248,8 @@ mount_error:
                  dev_name(dev), strerror_dev(dev));
         }
       }
-      if (!write_block_to_dev(dev, block)) {
+      /* Attempt write to check write permission */
+      if (!write_block_to_dev(jcr, dev, block)) {
          Jmsg2(jcr, M_ERROR, 0, _("Unable to write device %s. ERR=%s\n"),
            dev_name(dev), strerror_dev(dev));
         goto mount_next_vol;
@@ -259,8 +259,10 @@ mount_error:
            dev_name(dev), strerror_dev(dev));
         goto mount_next_vol;
       }
+
       /* Recreate a correct volume label and return it in the block */
       write_volume_label_to_block(jcr, dev, block);
+      /* Set or reset Volume statistics */
       dev->VolCatInfo.VolCatJobs = 1;
       dev->VolCatInfo.VolCatFiles = 1;
       dev->VolCatInfo.VolCatErrors = 0;
@@ -323,9 +325,8 @@ The number of files mismatch! Volume=%d Catalog=%d\n"),
            goto mount_next_vol;
         }
       }
-      /* Update Volume Info -- will be written at end of Job */
       dev->VolCatInfo.VolCatMounts++;     /* Update mounts */
-      dev->VolCatInfo.VolCatJobs++;
+      dir_update_volume_info(jcr, &dev->VolCatInfo, 0);
       /* Return an empty block */
       empty_block(block);            /* we used it for reading so set for write */
    }
@@ -342,15 +343,6 @@ int mount_next_read_volume(JCR *jcr, DEVICE *dev, DEV_BLOCK *block)
     * End Of Tape -- mount next Volume (if another specified)
     */
    if (jcr->NumVolumes > 1 && jcr->CurVolume < jcr->NumVolumes) {
-      VOL_LIST *vol = jcr->VolList;
-      /* Find next Volume */
-      jcr->CurVolume++;
-      for (int i=1; i<jcr->CurVolume; i++) {
-        vol = vol->next;
-      }
-      pm_strcpy(&jcr->VolumeName, vol->VolumeName);
-      Dmsg1(400, "There is another volume %s.\n", jcr->VolumeName);
-
       close_dev(dev);
       dev->state &= ~ST_READ; 
       if (!acquire_device_for_read(jcr, dev, block)) {