From: Kern Sibbald <kern@sibbald.com>
Date: Tue, 25 Dec 2012 16:29:26 +0000 (+0100)
Subject: Fix patches from master
X-Git-Tag: Release-7.0.0~58
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=af1feb7b41cdc0968cdcf1fd0f722309ab46bd74;p=bacula%2Fbacula

Fix patches from master
---

diff --git a/bacula/src/stored/mount.c b/bacula/src/stored/mount.c
index dc1f38bc19..68b5fedd97 100644
--- a/bacula/src/stored/mount.c
+++ b/bacula/src/stored/mount.c
@@ -863,11 +863,11 @@ bool mount_next_read_volume(DCR *dcr)
     * End Of Tape -- mount next Volume (if another specified)
     */
    if (jcr->NumReadVolumes > 1 && jcr->CurReadVolume < jcr->NumReadVolumes) {
-      dev->Lock();
+      dev->dlock();
       dev->close();
       dev->set_read();
       dcr->set_reserved();
-      dev->Unlock();
+      dev->dunlock();
       if (!acquire_device_for_read(dcr)) {
          Jmsg2(jcr, M_FATAL, 0, _("Cannot open Dev=%s, Vol=%s\n"), dev->print_name(),
                dcr->VolumeName);
diff --git a/bacula/src/stored/vol_mgr.c b/bacula/src/stored/vol_mgr.c
index a89584d137..7d12be97cc 100644
--- a/bacula/src/stored/vol_mgr.c
+++ b/bacula/src/stored/vol_mgr.c
@@ -443,10 +443,9 @@ VOLRES *reserve_volume(DCR *dcr, const char *VolumeName)
             vol->dev = dev;              /* point the Volume at our drive */
             dev->vol = vol;              /* point our drive at the Volume */
          } else {
-            Jmsg8(jcr, M_WARNING, 0, "Need volume for %s from other drive, "
+            Jmsg7(dcr->jcr, M_WARNING, 0, "Need volume from other drive, "
                "but swap not possible. Status: read=%d num_writers=%d "
                "num_reserve=%d swap=%d vol=%s from dev=%s to %s\n", 
-               dcr->is_write_acquire()?"write":"read",
                vol->dev->can_read(), vol->dev->num_writers,
                vol->dev->num_reserved(), vol->is_swapping(),
                VolumeName, vol->dev->print_name(), dev->print_name());