From: Monam Agarwal Date: Sat, 22 Mar 2014 20:32:29 +0000 (+0530) Subject: drivers/block: Use RCU_INIT_POINTER(x, NULL) in drbd/drbd_state.c X-Git-Tag: v3.17-rc1~31^2~33 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=ccdd6a93ee0c4a68cfaeddc80a87fc092ff35b96;p=karo-tx-linux.git drivers/block: Use RCU_INIT_POINTER(x, NULL) in drbd/drbd_state.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 Signed-off-by: Lars Ellenberg --- diff --git a/drivers/block/drbd/drbd_state.c b/drivers/block/drbd/drbd_state.c index a7772e2aba7e..4a75b7a03b9d 100644 --- a/drivers/block/drbd/drbd_state.c +++ b/drivers/block/drbd/drbd_state.c @@ -1570,7 +1570,7 @@ static int w_after_conn_state_ch(struct drbd_work *w, int unused) old_conf = connection->net_conf; connection->my_addr_len = 0; connection->peer_addr_len = 0; - rcu_assign_pointer(connection->net_conf, NULL); + RCU_INIT_POINTER(connection->net_conf, NULL); conn_free_crypto(connection); mutex_unlock(&connection->resource->conf_update);