Make sure we unload the right slot when swapping.

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/branches/Branch-2.2@6941 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 2b5b28efa71caad79fab44f30b1f4b652cccf7cc..cf68646fc70471d4df6ab7936c7ec4de1c182364 100644 (file)
--- a/bacula/src/version.h
+++ b/bacula/src/version.h
@@ -3,9 +3,9 @@
  */
 
 #undef  VERSION
-#define VERSION "2.2.10-b2"
-#define BDATE   "08 May 2008"
-#define LSMDATE "08May08"
+#define VERSION "2.2.10-b3"
+#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.1 b/bacula/technotes-2.1
index cb7f5912180028712b1698c2da1e07e593deac12..fda3144b4b38c947b2bef7720cc17ab840d9aaaf 100644 (file)
--- a/bacula/technotes-2.1
+++ b/bacula/technotes-2.1
@@ -2,6 +2,8 @@
 
 General:
 
+11May08
+kes  Make sure we unload the right slot when swapping.
 08May08
 kes  Improve SD reserve debug code.
 kes  Testing an improvement to free up volumes no longer in use.