From: Eric Bollengier <eric@eb.homelinux.org>
Date: Tue, 2 Dec 2008 18:44:20 +0000 (+0000)
Subject: ebl  Update patch to remove an extra lock()
X-Git-Tag: Release-2.4.4~27
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=c8e8eb26aea9dadd0ae73e1d3ae559e359784f36;p=bacula%2Fbacula

ebl  Update patch to remove an extra lock()


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

diff --git a/bacula/patches/2.4.3-prune-deadlock.patch b/bacula/patches/2.4.3-prune-deadlock.patch
index 1e26d374d1..c563df86be 100644
--- a/bacula/patches/2.4.3-prune-deadlock.patch
+++ b/bacula/patches/2.4.3-prune-deadlock.patch
@@ -33,3 +33,24 @@ Index: src/lib/jcr.c
     job_end_pop(jcr);                  /* pop and call hooked routines */
  
     Dmsg1(3400, "End job=%d\n", jcr->JobId);
+Index: src/dird/ua_prune.c
+===================================================================
+--- src/dird/ua_prune.c (révision 8100)
++++ src/dird/ua_prune.c (copie de travail)
+@@ -435,8 +435,6 @@
+       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 @@
+    }
+
+ bail_out:
+-   db_unlock(ua->db);
+    return count;
+ }
+