Remove unneeded timeout when remove of temporary device succeeded.

git-svn-id: https://cryptsetup.googlecode.com/svn/trunk@72 36d66b0a-2a48-0410-832c-cd162a569da5

diff --git a/ChangeLog b/ChangeLog
index 96c57e4..bbcbc50 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,7 @@
 2009-07-22  Milan Broz  <mbroz@redhat.com>
+       * Remove unneeded timeout when remove of temporary device succeeded.
+
+2009-07-22  Milan Broz  <mbroz@redhat.com>
        * version 1.0.7
 
 2009-07-16  Milan Broz  <mbroz@redhat.com>

diff --git a/lib/libdevmapper.c b/lib/libdevmapper.c
index 54f373c..d272e4a 100644 (file)
--- a/lib/libdevmapper.c
+++ b/lib/libdevmapper.c
@@ -240,7 +240,7 @@ static int _dm_remove(struct crypt_options *options, int force)
 
        do {
                r = _dm_simple(DM_DEVICE_REMOVE, options->name) ? 0 : -EINVAL;
-               if (--retries)
+               if (--retries && r)
                        sleep(1);
        } while (r == -EINVAL && retries);