lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
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: Monam Agarwal <monamagarwal123@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Monam Agarwal 2014-03-24 00:41:13 +05:30 committed by David S. Miller
parent c956674b7c
commit cd18721e52
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
net/bridge/br_vlan.c
View File

@ -99,9 +99,9 @@ static int __vlan_del(struct net_port_vlans *v, u16 vid)
v->num_vlans--; v->num_vlans--;
if (bitmap_empty(v->vlan_bitmap, VLAN_N_VID)) { if (bitmap_empty(v->vlan_bitmap, VLAN_N_VID)) {
if (v->port_idx) if (v->port_idx)
rcu_assign_pointer(v->parent.port->vlan_info, NULL); RCU_INIT_POINTER(v->parent.port->vlan_info, NULL);
else else
rcu_assign_pointer(v->parent.br->vlan_info, NULL); RCU_INIT_POINTER(v->parent.br->vlan_info, NULL);
kfree_rcu(v, rcu); kfree_rcu(v, rcu);
} }
return 0; return 0;
@ -113,9 +113,9 @@ static void __vlan_flush(struct net_port_vlans *v)
v->pvid = 0; v->pvid = 0;
bitmap_zero(v->vlan_bitmap, VLAN_N_VID); bitmap_zero(v->vlan_bitmap, VLAN_N_VID);
if (v->port_idx) if (v->port_idx)
rcu_assign_pointer(v->parent.port->vlan_info, NULL); RCU_INIT_POINTER(v->parent.port->vlan_info, NULL);
else else
rcu_assign_pointer(v->parent.br->vlan_info, NULL); RCU_INIT_POINTER(v->parent.br->vlan_info, NULL);
kfree_rcu(v, rcu); kfree_rcu(v, rcu);
} }