From: Karel Zak <kzak@redhat.com>
Date: Thu, 26 Jan 2012 14:01:01 +0000 (+0100)
Subject: libmount: fix context test logic
X-Git-Tag: v2.21-rc2~87
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d89670b515d00de8de7ac831c0faecb8aacad746;p=thirdparty%2Futil-linux.git

libmount: fix context test logic

Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/libmount/src/context.c b/libmount/src/context.c
index ac48fce368..4494ac6c1e 100644
--- a/libmount/src/context.c
+++ b/libmount/src/context.c
@@ -1997,7 +1997,7 @@ int test_mount(struct libmnt_test *ts, int argc, char *argv[])
 		mnt_context_set_target(cxt, argv[idx++]);
 	}
 
-	/* this is unnecessary -- libmount is able to internaly
+	/* this is unnecessary! -- libmount is able to internaly
 	 * create and manage the lock
 	 */
 	lock = mnt_context_get_lock(cxt);
@@ -2010,6 +2010,7 @@ int test_mount(struct libmnt_test *ts, int argc, char *argv[])
 	else
 		printf("successfully mounted\n");
 
+	lock = NULL;	/* because we use atexit lock_fallback */
 	mnt_free_context(cxt);
 	return rc;
 }
@@ -2064,6 +2065,7 @@ int test_umount(struct libmnt_test *ts, int argc, char *argv[])
 	else
 		printf("successfully umounted\n");
 err:
+	lock = NULL;	/* because we use atexit lock_fallback */
 	mnt_free_context(cxt);
 	return rc;
 }