From: Mukesh Kacker Date: Sat, 21 Jun 2014 01:42:23 +0000 (-0700) Subject: RDS/IB: Remove dangling rcu_read_unlock() and other cleanups X-Git-Tag: v4.1.12-92~293^2^2~25 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=3eb5f0b367305aff1cac913608f4c8f9d8d56882;p=users%2Fjedix%2Flinux-maple.git RDS/IB: Remove dangling rcu_read_unlock() and other cleanups Delete dangling rcu_read_unlock() which was left behind when matching rcu_read_lock() and enclosed code was removed in commit 538f5d0dfa704f4dcb4afa80a1d01b1317b9cd65 All compiler warnings are also fixed. Orabug: 18995395 Signed-off-by: Mukesh Kacker Reviewed-by: Rama Nichanamatlu Signed-off-by: Guangyu Sun (cherry picked from commit ba3dcd2f88fbf554f77bb312727c88193decfb75) --- diff --git a/net/rds/ib.c b/net/rds/ib.c index 78550ab3047e9..f6b6450a30c0a 100644 --- a/net/rds/ib.c +++ b/net/rds/ib.c @@ -802,7 +802,7 @@ static int rds_ib_move_ip(char *from_dev, goto out; } - work->conn = (struct rds_ib_connection *)ic->conn; + work->conn = ic->conn; INIT_DELAYED_WORK(&work->work, rds_ib_conn_drop); queue_delayed_work(rds_aux_wq, &work->work, msecs_to_jiffies(1000 * rds_ib_active_bonding_reconnect_delay)); @@ -1402,8 +1402,6 @@ static int rds_ib_ip_config_init(void) if (!rds_ib_active_bonding_enabled) return 0; - rcu_read_unlock(); - ip_config = kzalloc(sizeof(struct rds_ib_port) * (ip_port_max + 1), GFP_KERNEL); if (!ip_config) { diff --git a/net/rds/ib.h b/net/rds/ib.h index 2149fcbcdc296..b8a1e6a120183 100644 --- a/net/rds/ib.h +++ b/net/rds/ib.h @@ -323,7 +323,7 @@ struct rds_ib_port_ud_work { struct rds_ib_conn_drop_work { struct delayed_work work; - struct rds_ib_connection *conn; + struct rds_connection *conn; }; struct rds_ib_addr_change_work {