Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8511a272 authored by David Teigland's avatar David Teigland
Browse files

dlm: fix use count with multiple joins 



When a lockspace was joined multiple times, the global dlm
use count was incremented when it should not have been.  This
caused the global dlm threads to not be stopped when all
lockspaces were eventually be removed.

Signed-off-by: default avatarDavid Teigland <teigland@redhat.com>
parent 08ce4c91

fs/dlm/lockspace.c

+6 −7
Original line number Diff line number Diff line
@@ -419,16 +419,14 @@ static int new_lockspace(const char *name, int namelen, void **lockspace, 
			break;

		}

		ls->ls_create_count++;

		module_put(THIS_MODULE);

		error = 1; /* not an error, return 0 */

		*lockspace = ls;

		error = 1;

		break;

	}

	spin_unlock(&lslist_lock);



	if (error < 0)

		goto out;

	if (error)

		goto ret_zero;

		goto out;



	error = -ENOMEM;
@@ -583,7 +581,6 @@ static int new_lockspace(const char *name, int namelen, void **lockspace, 
	dlm_create_debug_file(ls);



	log_debug(ls, "join complete");

 ret_zero:

	*lockspace = ls;

	return 0;
@@ -628,7 +625,9 @@ int dlm_new_lockspace(const char *name, int namelen, void **lockspace, 
	error = new_lockspace(name, namelen, lockspace, flags, lvblen);

	if (!error)

		ls_count++;

	else if (!ls_count)

	if (error > 0)

		error = 0;

	if (!ls_count)

		threads_stop();

 out:

	mutex_unlock(&ls_lock);