Commit a590f476 authored by Florian Westphal's avatar Florian Westphal Committed by Pablo Neira Ayuso
Browse files

netfilter: nft_set_pipapo: move prove_locking helper around 



Preparation patch, the helper will soon get called from insert
function too.

Signed-off-by: default avatarFlorian Westphal <fw@strlen.de>
Reviewed-by: default avatarStefano Brivio <sbrivio@redhat.com>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent 119c790a

net/netfilter/nft_set_pipapo.c

+11 −11
Original line number Diff line number Diff line
@@ -1247,6 +1247,17 @@ static int pipapo_realloc_scratch(struct nft_pipapo_match *clone, 
	return 0;

}



static bool nft_pipapo_transaction_mutex_held(const struct nft_set *set)

{

#ifdef CONFIG_PROVE_LOCKING

	const struct net *net = read_pnet(&set->net);



	return lockdep_is_held(&nft_pernet(net)->commit_mutex);

#else

	return true;

#endif

}



/**

 * nft_pipapo_insert() - Validate and insert ranged elements

 * @net:	Network namespace
@@ -1799,17 +1810,6 @@ static void nft_pipapo_commit(struct nft_set *set) 
	priv->clone = new_clone;

}



static bool nft_pipapo_transaction_mutex_held(const struct nft_set *set)

{

#ifdef CONFIG_PROVE_LOCKING

	const struct net *net = read_pnet(&set->net);



	return lockdep_is_held(&nft_pernet(net)->commit_mutex);

#else

	return true;

#endif

}



static void nft_pipapo_abort(const struct nft_set *set)

{

	struct nft_pipapo *priv = nft_set_priv(set);