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 0a9634de2c493077e489888ac0ea0d019a6f69f1..6e5e1ff3fa3433d9a644d9b8cb9a59b378b56171 100644 (file)
--- 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 5c4bb33306c03d0498a182085d20075f379addd7..4d64267f58d0ea975d78de0062a9aa9bcdd0bf4c 100644 (file)
--- 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 1a948a0fb9f7aa5466f1b9479234573369d01ca2..9d5afc8934bf9f0426af89043585949bef5f8a25 100644 (file)
--- 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