X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;ds=sidebyside;f=bacula%2Fsrc%2Fstored%2Fmount.c;h=f03f9e68925e9f777c7e3be8ab284d5e71799f35;hb=85319cb5b8d9b163972aa8deb764e440824dc72a;hp=4f23f83c5844f5c654d16e549263f5e89b0ca6f6;hpb=28a45733fdb9131af7db083f5e40a44e173c679d;p=bacula%2Fbacula

diff --git a/bacula/src/stored/mount.c b/bacula/src/stored/mount.c
index 4f23f83c58..f03f9e6892 100644
--- a/bacula/src/stored/mount.c
+++ b/bacula/src/stored/mount.c
@@ -30,7 +30,7 @@
 #include "bacula.h"                   /* pull in global headers */
 #include "stored.h"                   /* pull in Storage Deamon headers */
 
-static bool rewrite_volume_label(JCR *jcr, DEVICE *dev, DEV_BLOCK *bloc, bool recycle);
+static bool rewrite_volume_label(DCR *dcr, DEV_BLOCK *block, bool recycle);
 
 
 /*
@@ -45,11 +45,13 @@ static bool rewrite_volume_label(JCR *jcr, DEVICE *dev, DEV_BLOCK *bloc, bool re
  *  impossible to get the requested Volume.
  *
  */
-int mount_next_write_volume(JCR *jcr, DEVICE *dev, DEV_BLOCK *block, bool release)
+bool mount_next_write_volume(DCR *dcr, DEV_BLOCK *block, bool release)
 {
    int retry = 0;
    bool ask = false, recycle, autochanger;
    int vol_label_status;
+   DEVICE *dev = dcr->dev;
+   JCR *jcr = dcr->jcr;
 
    Dmsg0(100, "Enter mount_next_volume()\n");
 
@@ -65,15 +67,15 @@ mount_next_vol:
    if (!dev->poll && retry++ > 4) {
       /* Last ditch effort before giving up, force operator to respond */
       jcr->VolCatInfo.Slot = 0;
-      if (!dir_ask_sysop_to_mount_volume(jcr, dev)) {
+      if (!dir_ask_sysop_to_mount_volume(dcr)) {
          Jmsg(jcr, M_FATAL, 0, _("Too many errors trying to mount device %s.\n"), 
 	      dev_name(dev));
-	 return 0;
+	 return false;
       }
    }
    if (job_canceled(jcr)) {
       Jmsg(jcr, M_FATAL, 0, _("Job %d canceled.\n"), jcr->JobId);
-      return 0;
+      return false;
    }
    recycle = false;
    if (release) {
@@ -87,15 +89,15 @@ mount_next_vol:
     *	 in jcr->VolCatInfo
     */
    Dmsg0(200, "Before dir_find_next_appendable_volume.\n");
-   while (!dir_find_next_appendable_volume(jcr)) {
+   while (!dir_find_next_appendable_volume(dcr)) {
        Dmsg0(200, "not dir_find_next\n");
-       if (!dir_ask_sysop_to_create_appendable_volume(jcr, dev)) {
-	 return 0;
+       if (!dir_ask_sysop_to_create_appendable_volume(dcr)) {
+	 return false;
        }
        Dmsg0(200, "Again dir_find_next_append...\n");
    }
    if (job_canceled(jcr)) {
-      return 0;
+      return false;
    }
    Dmsg2(100, "After find_next_append. Vol=%s Slot=%d\n",
 	 jcr->VolCatInfo.VolCatName, jcr->VolCatInfo.Slot);
@@ -115,7 +117,7 @@ mount_next_vol:
     */
    dev->state &= ~(ST_APPEND|ST_READ|ST_EOT|ST_WEOT|ST_EOF);
 
-   if (autoload_device(jcr, dev, 1, NULL) > 0) {
+   if (autoload_device(dcr, 1, NULL) > 0) {
       autochanger = true;
       ask = false;
    } else {
@@ -139,12 +141,12 @@ mount_next_vol:
    Dmsg2(100, "Ask=%d autochanger=%d\n", ask, autochanger);
    release = true;                /* release next time if we "recurse" */
 
-   if (ask && !dir_ask_sysop_to_mount_volume(jcr, dev)) {
+   if (ask && !dir_ask_sysop_to_mount_volume(dcr)) {
       Dmsg0(100, "Error return ask_sysop ...\n");
-      return 0; 	     /* error return */
+      return false;	     /* error return */
    }
    if (job_canceled(jcr)) {
-      return 0;
+      return false;
    }
    Dmsg1(100, "want vol=%s\n", jcr->VolumeName);
 
@@ -154,7 +156,11 @@ mount_next_vol:
 
    /* Ensure the device is open */
    if (!open_device(jcr, dev)) {
-      return 0;
+      if (dev->poll) {
+	 goto mount_next_vol;
+      } else {
+	 return false;
+      }
    }
 
    /*
@@ -170,7 +176,10 @@ read_volume:
       create_volume_label(dev, jcr->VolumeName, "Default");
       dev->VolHdr.LabelType = PRE_LABEL;
    } else {
-      vol_label_status = read_dev_volume_label(jcr, dev, block);
+      vol_label_status = read_dev_volume_label(jcr->dcr, block);
+   }
+   if (job_canceled(jcr)) {
+      return false;
    }
 
    Dmsg2(100, "dirVol=%s dirStat=%s\n", jcr->VolumeName,
@@ -213,7 +222,7 @@ read_volume:
       memcpy(&VolCatInfo, &jcr->VolCatInfo, sizeof(VolCatInfo));
       /* Check if this is a valid Volume in the pool */
       pm_strcpy(&jcr->VolumeName, dev->VolHdr.VolName); 			
-      if (!dir_get_volume_info(jcr, GET_VOL_INFO_FOR_WRITE)) {
+      if (!dir_get_volume_info(dcr, GET_VOL_INFO_FOR_WRITE)) {
 	 bstrncpy(dev->BadVolName, dev->VolHdr.VolName, sizeof(dev->BadVolName));
          Jmsg(jcr, M_WARNING, 0, _("Director wanted Volume \"%s\".\n"
               "    Current Volume \"%s\" not acceptable because:\n"
@@ -250,7 +259,7 @@ read_volume:
                                    "Recycle") == 0))) {
          Dmsg0(100, "Create volume label\n");
 	 /* Create a new Volume label and write it to the device */
-	 if (!write_new_volume_label_to_dev(jcr, (DEVRES *)dev->device, jcr->VolumeName,
+	 if (!write_new_volume_label_to_dev(jcr->dcr, jcr->VolumeName,
 		jcr->pool_name)) {
             Dmsg0(100, "!write_vol_label\n");
 	    goto mount_next_vol;
@@ -258,7 +267,7 @@ read_volume:
          Dmsg0(100, "dir_update_vol_info. Set Append\n");
          /* Copy Director's info into the device info */
 	 memcpy(&dev->VolCatInfo, &jcr->VolCatInfo, sizeof(dev->VolCatInfo));
-	 dir_update_volume_info(jcr, dev, 1);  /* indicate tape labeled */
+	 dir_update_volume_info(dcr, true);  /* indicate tape labeled */
          Jmsg(jcr, M_INFO, 0, _("Labeled new Volume \"%s\" on device %s.\n"),
 	    jcr->VolumeName, dev_name(dev));
 	 goto read_volume;	/* read label we just wrote */
@@ -297,7 +306,7 @@ read_volume:
     *  If the tape is marked as Recycle, we rewrite the label.
     */
    if (dev->VolHdr.LabelType == PRE_LABEL || recycle) {
-      if (!rewrite_volume_label(jcr, dev, block, recycle)) {
+      if (!rewrite_volume_label(jcr->dcr, block, recycle)) {
 	 goto mount_next_vol;
       }
    } else {
@@ -334,13 +343,13 @@ The number of files mismatch! Volume=%u Catalog=%u\n"),
       }
       dev->VolCatInfo.VolCatMounts++;	   /* Update mounts */
       Dmsg1(100, "update volinfo mounts=%d\n", dev->VolCatInfo.VolCatMounts);
-      dir_update_volume_info(jcr, dev, 0);
+      dir_update_volume_info(dcr, false);
       /* Return an empty block */
       empty_block(block);	      /* we used it for reading so set for write */
    }
    dev->state |= ST_APPEND;
    Dmsg0(100, "Normal return from read_dev_for_append\n");
-   return 1; 
+   return true;
 }
 
 /*
@@ -348,11 +357,14 @@ The number of files mismatch! Volume=%u Catalog=%u\n"),
  *  Returns: true if OK
  *	     false if unable to write it
  */
-static bool rewrite_volume_label(JCR *jcr, DEVICE *dev, DEV_BLOCK *block, bool recycle)
+static bool rewrite_volume_label(DCR *dcr, DEV_BLOCK *block, bool recycle)
 {
+   DEVICE *dev = dcr->dev;
+   JCR *jcr = dcr->jcr;
+
    Dmsg1(190, "ready_for_append found freshly labeled volume. dev=%x\n", dev);
    dev->VolHdr.LabelType = VOL_LABEL; /* set Volume label */
-   if (!write_volume_label_to_block(jcr, dev, block)) {
+   if (!write_volume_label_to_block(dcr, block)) {
       return false;
    }
    /*
@@ -372,7 +384,7 @@ static bool rewrite_volume_label(JCR *jcr, DEVICE *dev, DEV_BLOCK *block, bool r
 	 }
       }
       /* Attempt write to check write permission */
-      if (!write_block_to_dev(jcr->dcr, block)) {
+      if (!write_block_to_dev(dcr, block)) {
          Jmsg2(jcr, M_ERROR, 0, _("Unable to write device \"%s\". ERR=%s\n"),
 	    dev_name(dev), strerror_dev(dev));
 	 return false;
@@ -396,7 +408,7 @@ static bool rewrite_volume_label(JCR *jcr, DEVICE *dev, DEV_BLOCK *block, bool r
    }
    Dmsg0(100, "dir_update_vol_info. Set Append\n");
    bstrncpy(dev->VolCatInfo.VolCatStatus, "Append", sizeof(dev->VolCatInfo.VolCatStatus));
-   dir_update_volume_info(jcr, dev, 1);  /* indicate doing relabel */
+   dir_update_volume_info(dcr, true);  /* indicate doing relabel */
    if (recycle) {
       Jmsg(jcr, M_INFO, 0, _("Recycled volume \"%s\" on device \"%s\", all previous data lost.\n"),
 	 jcr->VolumeName, dev_name(dev));
@@ -421,14 +433,14 @@ void mark_volume_in_error(JCR *jcr, DEVICE *dev)
 	jcr->VolumeName);
    bstrncpy(dev->VolCatInfo.VolCatStatus, "Error", sizeof(dev->VolCatInfo.VolCatStatus));
    Dmsg0(100, "dir_update_vol_info. Set Error.\n");
-   dir_update_volume_info(jcr, dev, 0);
+   dir_update_volume_info(jcr->dcr, false);
 }
 
 /* 
  * If we are reading, we come here at the end of the tape
  *  and see if there are more volumes to be mounted.
  */
-int mount_next_read_volume(JCR *jcr, DEVICE *dev, DEV_BLOCK *block)
+bool mount_next_read_volume(JCR *jcr, DEVICE *dev, DEV_BLOCK *block)
 {
    Dmsg2(90, "NumVolumes=%d CurVolume=%d\n", jcr->NumVolumes, jcr->CurVolume);
    /*
@@ -440,12 +452,12 @@ int mount_next_read_volume(JCR *jcr, DEVICE *dev, DEV_BLOCK *block)
       if (!acquire_device_for_read(jcr)) {
          Jmsg2(jcr, M_FATAL, 0, "Cannot open Dev=%s, Vol=%s\n", dev_name(dev),
 	       jcr->VolumeName);
-	 return 0;
+	 return false;
       }
-      return 1; 		      /* next volume mounted */
+      return true;		      /* next volume mounted */
    }
    Dmsg0(90, "End of Device reached.\n");
-   return 0;
+   return false;
 }
 
 /*