sanlock: don't unlink lockspace if registration fails

This is a patch for bug 847848
If registering an existing lockspace with the sanlock daemon
returns an error, libvirt should not proceed to unlink the lockspace.

Signed-off-by: Asad Saeed <asad.saeed@acidseed.com>

diff --git a/AUTHORS b/AUTHORS
index 016bd15427e9a12f4c2c1256e6eced1890c7a59d..6b228ecbd7438a4854258cac0a2809760dd888f5 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -255,6 +255,7 @@ Patches have also been contributed by:
   Richa Marwaha        <rmarwah@linux.vnet.ibm.com>
   Peter Feiner         <peter@gridcentric.ca>
   Frido Roose          <frido.roose@gmail.com>
+  Asad Saeed           <asad.saeed@acidseed.com>
 
   [....send patches to get your name here....]
 

diff --git a/src/locking/lock_driver_sanlock.c b/src/locking/lock_driver_sanlock.c
index 9ec99dd7d4923e8bdf45f11a14d1240145c1c952..f046102f6a5d1f7e9d4abd9c26d7637c47a08605 100644 (file)
--- a/src/locking/lock_driver_sanlock.c
+++ b/src/locking/lock_driver_sanlock.c
@@ -242,7 +242,7 @@ static int virLockManagerSanlockSetupLockspace(void)
                 virReportSystemError(-rv,
                                      _("Unable to add lockspace %s"),
                                      path);
-            goto error_unlink;
+            goto error;
         } else {
             VIR_DEBUG("Lockspace %s is already registered", path);
         }