From ccf182241dc04c79e2377b6ba2f060dbfe6dddae Mon Sep 17 00:00:00 2001
From: Loic Dachary <loic@dachary.org>
Date: Mon, 30 Dec 2013 17:15:29 +0100
Subject: [PATCH] ceph-disk: make exception handling terse in
 main_activate_journal

Signed-off-by: Loic Dachary <loic@dachary.org>
(cherry picked from commit 908348b8047e8577ecf9133f2683f91423694416)
---
 src/ceph-disk | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/ceph-disk b/src/ceph-disk
index b2e183e1721b..900464163a76 100755
--- a/src/ceph-disk
+++ b/src/ceph-disk
@@ -1893,12 +1893,9 @@ def main_activate_journal(args):
             osd_id=osd_id,
             )
 
+    finally:
         activate_lock.release()
 
-    except:
-        activate_lock.release()
-        raise
-
 ###########################
 
 def main_activate_all(args):
-- 
2.47.3