From bcc56c7f9bf455814723292435f46e31ec733537 Mon Sep 17 00:00:00 2001
From: Kern Sibbald <kern@sibbald.com>
Date: Sat, 17 Sep 2005 16:40:15 +0000
Subject: [PATCH] Make new_volume walk through all Vols looking for dev   to
 release.

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@2394 91ce42f0-d328-0410-95d8-f526ca767f89
---
 bacula/kernstodo            | 1 +
 bacula/kes-1.37             | 3 +++
 bacula/src/stored/reserve.c | 3 ++-
 bacula/src/version.h        | 4 ++--
 4 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/bacula/kernstodo b/bacula/kernstodo
index 3a6e5e086c..f922f9a6df 100644
--- a/bacula/kernstodo
+++ b/bacula/kernstodo
@@ -10,6 +10,7 @@ Version 1.37                Kern (see below)
 Final items for 1.37 before release:
 1. Fix bugs
 - Look at fixing restore status stats in SD.
+- Mount after manually unloading changer causes hang in SD
 - Check if ANSI tape labeling works with drive in
   read-only mode.
    > > btape: label.c:299 write_volume_label()
diff --git a/bacula/kes-1.37 b/bacula/kes-1.37
index aac31e0391..2099158693 100644
--- a/bacula/kes-1.37
+++ b/bacula/kes-1.37
@@ -4,6 +4,9 @@
 General:
 
 Changes to 1.37.39:
+17Sep05
+- Make new_volume walk through all Vols looking for dev 
+  to release.
 16Sep05
 - Make "quit" command in console always allowed.
 - Remove the storage list between each console command to
diff --git a/bacula/src/stored/reserve.c b/bacula/src/stored/reserve.c
index d3b1940d71..acb1f176b3 100644
--- a/bacula/src/stored/reserve.c
+++ b/bacula/src/stored/reserve.c
@@ -118,6 +118,7 @@ VOLRES *new_volume(DCR *dcr, const char *VolumeName)
    Dmsg1(400, "new_volume %s\n", VolumeName);
    P(vol_list_lock);
    if (dcr->dev) {
+again:
       foreach_dlist(vol, vol_list) {
          if (vol && vol->dev == dcr->dev) {
             vol_list->remove(vol);
@@ -125,7 +126,7 @@ VOLRES *new_volume(DCR *dcr, const char *VolumeName)
                free(vol->vol_name);
             }
             free(vol);
-            break;
+            goto again;
          }
       }
    }
diff --git a/bacula/src/version.h b/bacula/src/version.h
index 1c35c38b19..d74c8b23f5 100644
--- a/bacula/src/version.h
+++ b/bacula/src/version.h
@@ -4,8 +4,8 @@
 
 #undef  VERSION
 #define VERSION "1.37.39"
-#define BDATE   "16 September 2005"
-#define LSMDATE "16Sep05"
+#define BDATE   "17 September 2005"
+#define LSMDATE "17Sep05"
 
 /* Debug flags */
 #undef  DEBUG
-- 
2.39.5