Replace rcu_assign_pointer(x, NULL) with RCU_INIT_POINTER(x,NULL)
Subsystems (9)
cover Replace rcu_assign_pointer(x, NULL) with RCU_INIT_POINTER(x,NULL)
This patchset uses following coccinelle script to replace rcu_assign_pointer(x, NULL) with RCU_INIT_POINTER(x,NULL)
@@
expression E;
@@
- rcu_assign_pointer(
+ RCU_INIT_POINTER(
E, NULL)
Monam Agarwal (9):
rcu: Replace rcu_assign_pointer(x, NULL) with RCU_INIT_POINTER(x,
NULL) in drivers/net/ethernet/broadcom/bnx2.c
rcu: Replace rcu_assign_pointer(x, NULL) with RCU_INIT_POINTER(x,
NULL) in drivers/net/ethernet/chelsio/cxgb3/cxgb3_offload.c
rcu: Replace rcu_assign_pointer(x, NULL) with RCU_INIT_POINTER(x,
NULL) in drivers/net/macvtap.c
rcu: Replace rcu_assign_pointer(x, NULL) with RCU_INIT_POINTER(x,
NULL)
rcu: Replace rcu_assign_pointer(x, NULL) with RCU_INIT_POINTER(x,
NULL)
rcu: Replace rcu_assign_pointer(x, NULL) with RCU_INIT_POINTER(x,
NULL)
rcu: Replace rcu_assign_pointer(x, NULL) with RCU_INIT_POINTER(x,
NULL)
rcu: Replace rcu_assign_pointer(x, NULL) with RCU_INIT_POINTER(x,
NULL)
rcu: Replace rcu_assign_pointer(x, NULL) with RCU_INIT_POINTER(x,
NULL)
drivers/net/ethernet/broadcom/bnx2.c | 2 +- drivers/net/ethernet/chelsio/cxgb3/cxgb3_offload.c | 4 ++-- drivers/net/macvtap.c | 8 ++++---- drivers/net/ppp/pptp.c | 2 +- drivers/net/wireless/ath/carl9170/main.c | 12 ++++++------ drivers/scsi/libfc/fc_libfc.c | 4 ++-- drivers/target/tcm_fc/tfc_sess.c | 2 +- drivers/vhost/net.c | 2 +- drivers/vhost/test.c | 2 +- 9 files changed, 19 insertions(+), 19 deletions(-)
Signature · 1 line
1.7.9.5
PATCH 1/9 rcu: Replace rcu_assign_pointer(x, NULL) with RCU_INIT_POINTER(x, NULL) in drivers/net/ethernet/broadcom/bnx2.c
--- drivers/net/ethernet/broadcom/bnx2.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/broadcom/bnx2.c +1 -1
@@ -409,7 +409,7 @@ static int bnx2_unregister_cnic(struct net_device *dev)mutex_lock (&bp->cnic_lock); cp->drv_state =0 ; bnapi->cnic_present =0 ; -rcu_assign_pointer (bp->cnic_ops,NULL ); +RCU_INIT_POINTER (bp->cnic_ops,NULL );mutex_unlock (&bp->cnic_lock);synchronize_rcu ();return 0 ;
Signature · 1 line
1.7.9.5
PATCH 2/9 rcu: Replace rcu_assign_pointer(x, NULL) with RCU_INIT_POINTER(x, NULL) in drivers/net/ethernet/chelsio/cxgb3/cxgb3_offload.c
--- drivers/net/ethernet/chelsio/cxgb3/cxgb3_offload.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/ethernet/chelsio/cxgb3/cxgb3_offload.c +2 -2
@@ -1300,7 +1300,7 @@ int cxgb3_offload_activate(struct adapter *adapter) out_free_l2t:t3_free_l2t (L2DATA (dev)); -rcu_assign_pointer (dev->l2opt,NULL ); +RCU_INIT_POINTER (dev->l2opt,NULL ); out_free:kfree (t);return err;
@@ -1328,7 +1328,7 @@ void cxgb3_offload_deactivate(struct adapter *adapter)rcu_read_lock (); d =L2DATA (tdev);rcu_read_unlock (); -rcu_assign_pointer (tdev->l2opt,NULL ); +RCU_INIT_POINTER (tdev->l2opt,NULL );call_rcu (&d->rcu_head, clean_l2_data);if (t->nofail_skb)kfree_skb (t->nofail_skb);
Signature · 1 line
1.7.9.5
PATCH 3/9 rcu: Replace rcu_assign_pointer(x, NULL) with RCU_INIT_POINTER(x, NULL) in drivers/net/macvtap.c
--- drivers/net/macvtap.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/net/macvtap.c +4 -4
@@ -145,8 +145,8 @@ static void macvtap_put_queue(struct macvtap_queue *q)if (vlan) {int index =get_slot (vlan, q); -rcu_assign_pointer (vlan->taps[index],NULL ); -rcu_assign_pointer (q->vlan,NULL ); +RCU_INIT_POINTER (vlan->taps[index],NULL ); +RCU_INIT_POINTER (q->vlan,NULL );sock_put (&q->sk); --vlan->numvtaps; }
@@ -223,8 +223,8 @@ static void macvtap_del_queues(struct net_device *dev) lockdep_is_held(&macvtap_lock));if (q) { qlist[j++] = q; -rcu_assign_pointer (vlan->taps[i],NULL ); -rcu_assign_pointer (q->vlan,NULL ); +RCU_INIT_POINTER (vlan->taps[i],NULL ); +RCU_INIT_POINTER (q->vlan,NULL ); vlan->numvtaps--; } }
Signature · 1 line
1.7.9.5
PATCH 4/9 rcu: Replace rcu_assign_pointer(x, NULL) with RCU_INIT_POINTER(x, NULL)
--- drivers/net/ppp/pptp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ppp/pptp.c +1 -1
@@ -162,7 +162,7 @@ static void del_chan(struct pppox_sock *sock) {spin_lock (&chan_lock);clear_bit (sock->proto.pptp.src_addr.call_id, callid_bitmap); -rcu_assign_pointer (callid_sock[sock->proto.pptp.src_addr.call_id],NULL ); +RCU_INIT_POINTER (callid_sock[sock->proto.pptp.src_addr.call_id],NULL );spin_unlock (&chan_lock);synchronize_rcu (); }
Signature · 1 line
1.7.9.5
PATCH 5/9 rcu: Replace rcu_assign_pointer(x, NULL) with RCU_INIT_POINTER(x, NULL)
--- drivers/net/wireless/ath/carl9170/main.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
drivers/net/wireless/ath/carl9170/main.c +6 -6
@@ -446,7 +446,7 @@ static void carl9170_op_stop(struct ieee80211_hw *hw)mutex_lock (&ar->mutex);if (IS_ACCEPTING_CMD (ar)) { -rcu_assign_pointer (ar->beacon_iter,NULL ); +RCU_INIT_POINTER (ar->beacon_iter,NULL );carl9170_led_set_state (ar,0 );
@@ -678,7 +678,7 @@ unlock: vif_priv->active = false;bitmap_release_region (&ar->vif_bitmap, vif_id,0 ); ar->vifs--; -rcu_assign_pointer (ar->vif_priv[vif_id].vif,NULL ); +RCU_INIT_POINTER (ar->vif_priv[vif_id].vif,NULL );list_del_rcu (&vif_priv->list);mutex_unlock (&ar->mutex);synchronize_rcu ();
@@ -716,7 +716,7 @@ static void carl9170_op_remove_interface(struct ieee80211_hw *hw,WARN_ON (vif_priv->enable_beacon); vif_priv->enable_beacon = false;list_del_rcu (&vif_priv->list); -rcu_assign_pointer (ar->vif_priv[id].vif,NULL ); +RCU_INIT_POINTER (ar->vif_priv[id].vif,NULL );if (vif == main_vif) {rcu_read_unlock ();
@@ -1258,7 +1258,7 @@ static int carl9170_op_sta_add(struct ieee80211_hw *hw, }for (i =0 ; i <CARL9170_NUM_TID ; i++) -rcu_assign_pointer (sta_info->agg[i],NULL ); +RCU_INIT_POINTER (sta_info->agg[i],NULL ); sta_info->ampdu_max_len =1 << (3 + sta->ht_cap.ampdu_factor); sta_info->ht_sta = true;
@@ -1285,7 +1285,7 @@ static int carl9170_op_sta_remove(struct ieee80211_hw *hw,struct carl9170_sta_tid *tid_info; tid_info =rcu_dereference (sta_info->agg[i]); -rcu_assign_pointer (sta_info->agg[i],NULL ); +RCU_INIT_POINTER (sta_info->agg[i],NULL );if (!tid_info)continue ;
@@ -1398,7 +1398,7 @@ static int carl9170_op_ampdu_action(struct ieee80211_hw *hw,spin_unlock_bh (&ar->tx_ampdu_list_lock); } -rcu_assign_pointer (sta_info->agg[tid],NULL ); +RCU_INIT_POINTER (sta_info->agg[tid],NULL );rcu_read_unlock ();ieee80211_stop_tx_ba_cb_irqsafe (vif, sta->addr, tid);
Signature · 1 line
1.7.9.5
PATCH 6/9 rcu: Replace rcu_assign_pointer(x, NULL) with RCU_INIT_POINTER(x, NULL)
--- drivers/scsi/libfc/fc_libfc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/scsi/libfc/fc_libfc.c +2 -2
@@ -297,9 +297,9 @@ void fc_fc4_deregister_provider(enum fc_fh_type type, struct fc4_prov *prov)BUG_ON (type >=FC_FC4_PROV_SIZE );mutex_lock (&fc_prov_mutex);if (prov->recv) -rcu_assign_pointer (fc_passive_prov[type],NULL ); +RCU_INIT_POINTER (fc_passive_prov[type],NULL );else -rcu_assign_pointer (fc_active_prov[type],NULL ); +RCU_INIT_POINTER (fc_active_prov[type],NULL );mutex_unlock (&fc_prov_mutex);synchronize_rcu (); }
Signature · 1 line
1.7.9.5
PATCH 7/9 rcu: Replace rcu_assign_pointer(x, NULL) with RCU_INIT_POINTER(x, NULL)
--- drivers/target/tcm_fc/tfc_sess.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/target/tcm_fc/tfc_sess.c +1 -1
@@ -110,7 +110,7 @@ static void ft_tport_delete(struct ft_tport *tport)ft_sess_delete_all (tport); lport = tport->lport;BUG_ON (tport != lport->prov[FC_TYPE_FCP ]); -rcu_assign_pointer (lport->prov[FC_TYPE_FCP ],NULL ); +RCU_INIT_POINTER (lport->prov[FC_TYPE_FCP ],NULL ); tpg = tport->tpg;if (tpg) {
Signature · 1 line
1.7.9.5
PATCH 8/9 rcu: Replace rcu_assign_pointer(x, NULL) with RCU_INIT_POINTER(x, NULL)
--- drivers/vhost/net.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/vhost/net.c +1 -1
@@ -556,7 +556,7 @@ static struct socket *vhost_net_stop_vq(struct vhost_net *n, sock =rcu_dereference_protected (vq->private_data,lockdep_is_held (&vq->mutex));vhost_net_disable_vq (n, vq); -rcu_assign_pointer (vq->private_data,NULL ); +RCU_INIT_POINTER (vq->private_data,NULL );mutex_unlock (&vq->mutex);return sock; }
Signature · 1 line
1.7.9.5
PATCH 9/9 rcu: Replace rcu_assign_pointer(x, NULL) with RCU_INIT_POINTER(x, NULL)
--- drivers/vhost/test.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/vhost/test.c +1 -1
@@ -128,7 +128,7 @@ static void *vhost_test_stop_vq(struct vhost_test *n,mutex_lock (&vq->mutex); private =rcu_dereference_protected (vq->private_data,lockdep_is_held (&vq->mutex)); -rcu_assign_pointer (vq->private_data,NULL ); +RCU_INIT_POINTER (vq->private_data,NULL );mutex_unlock (&vq->mutex);return private; }
Signature · 1 line
1.7.9.5
Re: [PATCH 5/9] rcu: Replace rcu_assign_pointer(x, NULL) with RCU_INIT_POINTER(x, NULL)
In reply to Monam AgarwalQuoted 1 line · Monam Agarwal
Signed-off-by Monam Agarwal <[email protected]>
Quoted 65 lines
--- drivers/net/wireless/ath/carl9170/main.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)drivers/net/wireless/ath/carl9170/main.c +6
-6@@ -446,7 +446,7 @@ static void carl9170_op_stop(struct ieee80211_hw *hw)mutex_lock (&ar->mutex);if (IS_ACCEPTING_CMD (ar)) { -rcu_assign_pointer (ar->beacon_iter,NULL ); +RCU_INIT_POINTER (ar->beacon_iter,NULL );carl9170_led_set_state (ar,0 );@@ -678,7 +678,7 @@ unlock: vif_priv->active = false;bitmap_release_region (&ar->vif_bitmap, vif_id,0 ); ar->vifs--; -rcu_assign_pointer (ar->vif_priv[vif_id].vif,NULL ); +RCU_INIT_POINTER (ar->vif_priv[vif_id].vif,NULL );list_del_rcu (&vif_priv->list);mutex_unlock (&ar->mutex);synchronize_rcu ();@@ -716,7 +716,7 @@ static void carl9170_op_remove_interface(struct ieee80211_hw *hw,WARN_ON (vif_priv->enable_beacon); vif_priv->enable_beacon = false;list_del_rcu (&vif_priv->list); -rcu_assign_pointer (ar->vif_priv[id].vif,NULL ); +RCU_INIT_POINTER (ar->vif_priv[id].vif,NULL );if (vif == main_vif) {rcu_read_unlock ();@@ -1258,7 +1258,7 @@ static int carl9170_op_sta_add(struct ieee80211_hw *hw, }for (i =0 ; i <CARL9170_NUM_TID ; i++) -rcu_assign_pointer (sta_info->agg[i],NULL ); +RCU_INIT_POINTER (sta_info->agg[i],NULL ); sta_info->ampdu_max_len =1 << (3 + sta->ht_cap.ampdu_factor); sta_info->ht_sta = true;@@ -1285,7 +1285,7 @@ static int carl9170_op_sta_remove(struct ieee80211_hw *hw,struct carl9170_sta_tid *tid_info; tid_info =rcu_dereference (sta_info->agg[i]); -rcu_assign_pointer (sta_info->agg[i],NULL ); +RCU_INIT_POINTER (sta_info->agg[i],NULL );if (!tid_info)continue ;@@ -1398,7 +1398,7 @@ static int carl9170_op_ampdu_action(struct ieee80211_hw *hw,spin_unlock_bh (&ar->tx_ampdu_list_lock); } -rcu_assign_pointer (sta_info->agg[tid],NULL ); +RCU_INIT_POINTER (sta_info->agg[tid],NULL );rcu_read_unlock ();ieee80211_stop_tx_ba_cb_irqsafe (vif, sta->addr, tid);Signature · 1 line
1.7.9.5
Re: [PATCH 4/9] rcu: Replace rcu_assign_pointer(x, NULL) with RCU_INIT_POINTER(x, NULL)
In reply to Monam AgarwalQuoted 1 line · Monam Agarwal
Signed-off-by Monam Agarwal <[email protected]>
Quoted 20 lines
--- drivers/net/ppp/pptp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/net/ppp/pptp.c +1
-1@@ -162,7 +162,7 @@ static void del_chan(struct pppox_sock *sock) {spin_lock (&chan_lock);clear_bit (sock->proto.pptp.src_addr.call_id, callid_bitmap); -rcu_assign_pointer (callid_sock[sock->proto.pptp.src_addr.call_id],NULL ); +RCU_INIT_POINTER (callid_sock[sock->proto.pptp.src_addr.call_id],NULL );spin_unlock (&chan_lock);synchronize_rcu (); }Signature · 1 line
1.7.9.5
Re: [PATCH 3/9] rcu: Replace rcu_assign_pointer(x, NULL) with RCU_INIT_POINTER(x, NULL) in drivers/net/macvtap.c
In reply to Monam AgarwalQuoted 1 line · Monam Agarwal
Signed-off-by Monam Agarwal <[email protected]>
Quoted 33 lines
--- drivers/net/macvtap.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)drivers/net/macvtap.c +4
-4@@ -145,8 +145,8 @@ static void macvtap_put_queue(struct macvtap_queue *q)if (vlan) {int index =get_slot (vlan, q); -rcu_assign_pointer (vlan->taps[index],NULL ); -rcu_assign_pointer (q->vlan,NULL ); +RCU_INIT_POINTER (vlan->taps[index],NULL ); +RCU_INIT_POINTER (q->vlan,NULL );sock_put (&q->sk); --vlan->numvtaps; }@@ -223,8 +223,8 @@ static void macvtap_del_queues(struct net_device *dev) lockdep_is_held(&macvtap_lock));if (q) { qlist[j++] = q; -rcu_assign_pointer (vlan->taps[i],NULL ); -rcu_assign_pointer (q->vlan,NULL ); +RCU_INIT_POINTER (vlan->taps[i],NULL ); +RCU_INIT_POINTER (q->vlan,NULL ); vlan->numvtaps--; } }Signature · 1 line
1.7.9.5
Re: [PATCH 2/9] rcu: Replace rcu_assign_pointer(x, NULL) with RCU_INIT_POINTER(x, NULL) in drivers/net/ethernet/chelsio/cxgb3/cxgb3_offload.c
In reply to Monam AgarwalQuoted 1 line · Monam Agarwal
Signed-off-by Monam Agarwal <[email protected]>
Quoted 29 lines
--- drivers/net/ethernet/chelsio/cxgb3/cxgb3_offload.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)drivers/net/ethernet/chelsio/cxgb3/cxgb3_offload.c +2
-2@@ -1300,7 +1300,7 @@ int cxgb3_offload_activate(struct adapter *adapter) out_free_l2t:t3_free_l2t (L2DATA (dev)); -rcu_assign_pointer (dev->l2opt,NULL ); +RCU_INIT_POINTER (dev->l2opt,NULL ); out_free:kfree (t);return err;@@ -1328,7 +1328,7 @@ void cxgb3_offload_deactivate(struct adapter *adapter)rcu_read_lock (); d =L2DATA (tdev);rcu_read_unlock (); -rcu_assign_pointer (tdev->l2opt,NULL ); +RCU_INIT_POINTER (tdev->l2opt,NULL );call_rcu (&d->rcu_head, clean_l2_data);if (t->nofail_skb)kfree_skb (t->nofail_skb);Signature · 1 line
1.7.9.5
Re: [PATCH 1/9] rcu: Replace rcu_assign_pointer(x, NULL) with RCU_INIT_POINTER(x, NULL) in drivers/net/ethernet/broadcom/bnx2.c
In reply to Monam AgarwalQuoted 1 line · Monam Agarwal
Signed-off-by Monam Agarwal <[email protected]>
Quoted 20 lines
--- drivers/net/ethernet/broadcom/bnx2.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/net/ethernet/broadcom/bnx2.c +1
-1@@ -409,7 +409,7 @@ static int bnx2_unregister_cnic(struct net_device *dev)mutex_lock (&bp->cnic_lock); cp->drv_state =0 ; bnapi->cnic_present =0 ; -rcu_assign_pointer (bp->cnic_ops,NULL ); +RCU_INIT_POINTER (bp->cnic_ops,NULL );mutex_unlock (&bp->cnic_lock);synchronize_rcu ();return 0 ;Signature · 1 line
1.7.9.5