Commit 98ff7d95 authored by Alexander Aring's avatar Alexander Aring Committed by David Teigland
Browse files

dlm: use RSB_HASHED to avoid lookup twice 



Since commit 01fdeca1 ("dlm: use rcu to avoid an extra rsb struct
lookup") _dlm_master_lookup() is called under rcu lock that prevents
that the rsb structure is being freed. There was a missing change to
avoid an additional lookup and just check that the rsb is still part of
the ls_rsbtbl structure. This patch is doing such check instead of
lookup the rsb structure again.

Signed-off-by: default avatarAlexander Aring <aahringo@redhat.com>
Signed-off-by: default avatarDavid Teigland <teigland@redhat.com>
parent 94e180d6

fs/dlm/lock.c

+3 −3
Original line number Diff line number Diff line
@@ -1308,11 +1308,11 @@ static int _dlm_master_lookup(struct dlm_ls *ls, int from_nodeid, const char *na 
	}



 do_inactive:

	/* unlikely path - relookup under write */

	/* unlikely path - check if still part of ls_rsbtbl */

	write_lock_bh(&ls->ls_rsbtbl_lock);



	error = dlm_search_rsb_tree(&ls->ls_rsbtbl, name, len, &r);

	if (!error) {

	/* see comment in find_rsb_dir */

	if (rsb_flag(r, RSB_HASHED)) {

		if (!rsb_flag(r, RSB_INACTIVE)) {

			write_unlock_bh(&ls->ls_rsbtbl_lock);

			/* something as changed, very unlikely but