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

Commit 9afdb00c authored by Patrick McHardy's avatar Patrick McHardy Committed by David S. Miller
Browse files

[NETFILTER]: nfnetlink_log: remove conditional locking 



This is gross, have the wrapper function take the lock.

Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 370e6a87

net/netfilter/nfnetlink_log.c

+4 −14
Original line number Diff line number Diff line
@@ -195,20 +195,14 @@ instance_create(u_int16_t group_num, int pid) 
static int __nfulnl_send(struct nfulnl_instance *inst);



static void

_instance_destroy2(struct nfulnl_instance *inst, int lock)

__instance_destroy(struct nfulnl_instance *inst)

{

	/* first pull it out of the global list */

	if (lock)

		write_lock_bh(&instances_lock);



	UDEBUG("removing instance %p (queuenum=%u) from hash\n",

		inst, inst->group_num);



	hlist_del(&inst->hlist);



	if (lock)

		write_unlock_bh(&instances_lock);



	/* then flush all pending packets from skb */



	spin_lock_bh(&inst->lock);
@@ -229,16 +223,12 @@ _instance_destroy2(struct nfulnl_instance *inst, int lock) 
	instance_put(inst);

}



static inline void

__instance_destroy(struct nfulnl_instance *inst)

{

	_instance_destroy2(inst, 0);

}



static inline void

instance_destroy(struct nfulnl_instance *inst)

{

	_instance_destroy2(inst, 1);

	write_lock_bh(&instances_lock);

	__instance_destroy(inst);

	write_unlock_bh(&instances_lock);

}



static int