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

Commit cd18721e authored by Monam Agarwal's avatar Monam Agarwal Committed by David S. Miller
Browse files

net/bridge: Use RCU_INIT_POINTER(x, NULL) in br_vlan.c 



This patch replaces rcu_assign_pointer(x, NULL) with RCU_INIT_POINTER(x, NULL)

The rcu_assign_pointer() ensures that the initialization of a structure
is carried out before storing a pointer to that structure.
And in the case of the NULL pointer, there is no structure to initialize.
So, rcu_assign_pointer(p, NULL) can be safely converted to RCU_INIT_POINTER(p, NULL)

Signed-off-by: default avatarMonam Agarwal <monamagarwal123@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c956674b

net/bridge/br_vlan.c

+4 −4
Original line number Diff line number Diff line
@@ -99,9 +99,9 @@ static int __vlan_del(struct net_port_vlans *v, u16 vid) 
	v->num_vlans--;

	if (bitmap_empty(v->vlan_bitmap, VLAN_N_VID)) {

		if (v->port_idx)

			rcu_assign_pointer(v->parent.port->vlan_info, NULL);

			RCU_INIT_POINTER(v->parent.port->vlan_info, NULL);

		else

			rcu_assign_pointer(v->parent.br->vlan_info, NULL);

			RCU_INIT_POINTER(v->parent.br->vlan_info, NULL);

		kfree_rcu(v, rcu);

	}

	return 0;
@@ -113,9 +113,9 @@ static void __vlan_flush(struct net_port_vlans *v) 
	v->pvid = 0;

	bitmap_zero(v->vlan_bitmap, VLAN_N_VID);

	if (v->port_idx)

		rcu_assign_pointer(v->parent.port->vlan_info, NULL);

		RCU_INIT_POINTER(v->parent.port->vlan_info, NULL);

	else

		rcu_assign_pointer(v->parent.br->vlan_info, NULL);

		RCU_INIT_POINTER(v->parent.br->vlan_info, NULL);

	kfree_rcu(v, rcu);

}