From: Kern Sibbald <kern@sibbald.com>
Date: Thu, 10 Dec 2009 11:27:15 +0000 (+0100)
Subject: Fix another volume_lock dlock order problem
X-Git-Tag: Release-7.0.0~2472
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=c336f735dd27b32dc4656ebfe49dadfa77771a6a;p=bacula%2Fbacula

Fix another volume_lock dlock order problem
---

diff --git a/bacula/src/stored/mount.c b/bacula/src/stored/mount.c
index 4c022d54df..a8646bd73b 100644
--- a/bacula/src/stored/mount.c
+++ b/bacula/src/stored/mount.c
@@ -116,9 +116,11 @@ mount_next_vol:
       ask = true;                     /* ask operator to mount tape */
       do_find = true;                 /* re-find a volume after unload */
    }
+   unlock_volumes();
    do_unload();
    do_swapping(true /*is_writing*/);
    do_load(true /*is_writing*/);
+   lock_volumes();
 
    if (do_find && !find_a_volume()) {
       goto no_lock_bail_out;