From b6e8cdf294b6cb647cd7eb3283dd828911b8b759 Mon Sep 17 00:00:00 2001 From: Eric Bollengier Date: Tue, 2 Dec 2008 18:42:29 +0000 Subject: [PATCH] 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 --- bacula/src/dird/ua_prune.c | 3 --- bacula/technotes-2.5 | 1 + 2 files changed, 1 insertion(+), 3 deletions(-) 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 -- 2.39.5