From: Eric Bollengier <eric@eb.homelinux.org>
Date: Tue, 2 Dec 2008 18:42:29 +0000 (+0000)
Subject: ebl  Remove extra db_lock() in get_prune_list_for_volume()
X-Git-Tag: Release-7.0.0~3680
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=f184791c5fe28e1c65279ab95fb21918c39fbf05;p=bacula%2Fbacula

ebl  Remove extra db_lock() in get_prune_list_for_volume()



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

diff --git a/bacula/src/dird/ua_prune.c b/bacula/src/dird/ua_prune.c
index f0d50e2297..257e45428e 100644
--- a/bacula/src/dird/ua_prune.c
+++ b/bacula/src/dird/ua_prune.c
@@ -472,8 +472,6 @@ int get_prune_list_for_volume(UAContext *ua, MEDIA_DBR *mr, del_ctx *del)
       return 0;                    /* cannot prune Archived volumes */
    }
 
-   db_lock(ua->db);
-
    /*
     * Now add to the  list of JobIds for Jobs written to this Volume
     */
@@ -496,7 +494,6 @@ int get_prune_list_for_volume(UAContext *ua, MEDIA_DBR *mr, del_ctx *del)
    count = exclude_running_jobs_from_list(del);
    
 bail_out:
-   db_unlock(ua->db);
    return count;
 }
 
diff --git a/bacula/technotes-2.5 b/bacula/technotes-2.5
index dd68d2b234..3ec504c808 100644
--- a/bacula/technotes-2.5
+++ b/bacula/technotes-2.5
@@ -11,6 +11,7 @@ mixed priorities
 
 General:
 02Dec08
+ebl  Remove extra db_lock() in get_prune_list_for_volume()
 ebl  Apply 2.4.3-prune-deadlock.patch that fixes a problem when
      using Catalog as message backend.
 01Dec08