diff options
author | Monam Agarwal <monamagarwal123@gmail.com> | 2014-03-23 15:11:13 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-03-27 00:18:09 -0400 |
commit | cd18721e527270f9afa5c8daabfb6403b01e3a92 (patch) | |
tree | 3954ea5e6ab500fc23055e59e8d33caeffaf3aa4 | |
parent | c956674b7c89e7992a09df309a9f226f02733421 (diff) |
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: Monam Agarwal <monamagarwal123@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | net/bridge/br_vlan.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/bridge/br_vlan.c b/net/bridge/br_vlan.c index 8249ca764c79..5d5b101be102 100644 --- a/net/bridge/br_vlan.c +++ b/net/bridge/br_vlan.c | |||
@@ -99,9 +99,9 @@ static int __vlan_del(struct net_port_vlans *v, u16 vid) | |||
99 | v->num_vlans--; | 99 | v->num_vlans--; |
100 | if (bitmap_empty(v->vlan_bitmap, VLAN_N_VID)) { | 100 | if (bitmap_empty(v->vlan_bitmap, VLAN_N_VID)) { |
101 | if (v->port_idx) | 101 | if (v->port_idx) |
102 | rcu_assign_pointer(v->parent.port->vlan_info, NULL); | 102 | RCU_INIT_POINTER(v->parent.port->vlan_info, NULL); |
103 | else | 103 | else |
104 | rcu_assign_pointer(v->parent.br->vlan_info, NULL); | 104 | RCU_INIT_POINTER(v->parent.br->vlan_info, NULL); |
105 | kfree_rcu(v, rcu); | 105 | kfree_rcu(v, rcu); |
106 | } | 106 | } |
107 | return 0; | 107 | return 0; |
@@ -113,9 +113,9 @@ static void __vlan_flush(struct net_port_vlans *v) | |||
113 | v->pvid = 0; | 113 | v->pvid = 0; |
114 | bitmap_zero(v->vlan_bitmap, VLAN_N_VID); | 114 | bitmap_zero(v->vlan_bitmap, VLAN_N_VID); |
115 | if (v->port_idx) | 115 | if (v->port_idx) |
116 | rcu_assign_pointer(v->parent.port->vlan_info, NULL); | 116 | RCU_INIT_POINTER(v->parent.port->vlan_info, NULL); |
117 | else | 117 | else |
118 | rcu_assign_pointer(v->parent.br->vlan_info, NULL); | 118 | RCU_INIT_POINTER(v->parent.br->vlan_info, NULL); |
119 | kfree_rcu(v, rcu); | 119 | kfree_rcu(v, rcu); |
120 | } | 120 | } |
121 | 121 | ||