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

ebl  Remove extra db_lock() in get_prune_list_for_volume()



git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/branches/Branch-2.4@8105 91ce42f0-d328-0410-95d8-f526ca767f89
---

diff --git a/bacula/src/dird/ua_prune.c b/bacula/src/dird/ua_prune.c
index 3d91cc2329..a312d2188d 100644
--- a/bacula/src/dird/ua_prune.c
+++ b/bacula/src/dird/ua_prune.c
@@ -435,8 +435,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
     */
@@ -477,6 +475,5 @@ int get_prune_list_for_volume(UAContext *ua, MEDIA_DBR *mr, del_ctx *del)
    }
 
 bail_out:
-   db_unlock(ua->db);
    return count;
 }
diff --git a/bacula/technotes-2.4 b/bacula/technotes-2.4
index fe4d8fcece..8f4fa325f4 100644
--- a/bacula/technotes-2.4
+++ b/bacula/technotes-2.4
@@ -2,6 +2,7 @@
 
 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.
 20Nov08