From: Kern Sibbald <kern@sibbald.com>
Date: Sun, 11 May 2008 10:18:52 +0000 (+0000)
Subject: Make sure we unload the right slot when swapping.
X-Git-Tag: Release-7.0.0~4607
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=e226ecbd215c44d52875031b47459110b3e32183;p=bacula%2Fbacula

Make sure we unload the right slot when swapping.

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@6940 91ce42f0-d328-0410-95d8-f526ca767f89
---

diff --git a/bacula/src/stored/mount.c b/bacula/src/stored/mount.c
index 0a9634de2c..6e5e1ff3fa 100644
--- a/bacula/src/stored/mount.c
+++ b/bacula/src/stored/mount.c
@@ -486,9 +486,9 @@ void DCR::do_swapping(bool is_writing)
    if (dev->swap_dev) {
       if (dev->swap_dev->must_unload()) {
          if (dev->vol) {
-            dev->Slot = dev->vol->get_slot();
+            dev->swap_dev->Slot = dev->vol->get_slot();
          }
-         Dmsg2(100, "Swap unloading slot=%d %s\n", dev->Slot, 
+         Dmsg2(100, "Swap unloading slot=%d %s\n", dev->swap_dev->Slot, 
                dev->swap_dev->print_name());
          unload_dev(this, dev->swap_dev);
          dev->Slot = -1;
diff --git a/bacula/src/version.h b/bacula/src/version.h
index 5c4bb33306..4d64267f58 100644
--- a/bacula/src/version.h
+++ b/bacula/src/version.h
@@ -3,9 +3,9 @@
  */
 
 #undef  VERSION
-#define VERSION "2.3.20"
-#define BDATE   "10 May 2008"
-#define LSMDATE "10May08"
+#define VERSION "2.3.21"
+#define BDATE   "11 May 2008"
+#define LSMDATE "11May08"
 
 #define PROG_COPYRIGHT "Copyright (C) %d-2008 Free Software Foundation Europe e.V.\n"
 #define BYEAR "2008"       /* year for copyright messages in progs */
diff --git a/bacula/technotes-2.3 b/bacula/technotes-2.3
index 1a948a0fb9..9d5afc8934 100644
--- a/bacula/technotes-2.3
+++ b/bacula/technotes-2.3
@@ -24,6 +24,8 @@ Add long term statistics job table
 
 
 General:
+11May08
+kes  Make sure we unload the right slot when swapping.
 10May08
 kes  Add debug times, reduce size of two-pool-changer test 
 08May08