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 <mukesh.kacker@oracle.com>
Reviewed-by: Rama Nichanamatlu <rama.nichanamatlu@oracle.com>
Signed-off-by: Guangyu Sun <guangyu.sun@oracle.com>
(cherry picked from commit ba3dcd2f88fbf554f77bb312727c88193decfb75)

diff --git a/net/rds/ib.c b/net/rds/ib.c
index 78550ab3047e9de798821b46e640123ec81a4d50..f6b6450a30c0af5dbccab713e64e9c4d6d04da38 100644 (file)
--- 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 2149fcbcdc296c54b2698cd91d160e75294b693c..b8a1e6a1201830c25ea11a92af7ca686f1b5aa30 100644 (file)
--- 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 {