xprtrdma: Remove rpcrdma_ep::rep_func and ::rep_xprt

Clean up: The rep_func field always refers to rpcrdma_conn_func().
rep_func should have been removed by commit b45ccfd25d50 ("xprtrdma:
Remove MEMWINDOWS registration modes").

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Reviewed-by: Steve Wise <swise@opengridcomputing.com>
Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>

4 files changed, 6 insertions, 8 deletions

diff --git a/net/sunrpc/xprtrdma/rpc_rdma.c b/net/sunrpc/xprtrdma/rpc_rdma.c
index d7310109b601..f2eda155299a 100644
--- a/net/sunrpc/xprtrdma/rpc_rdma.c
+++ b/net/sunrpc/xprtrdma/rpc_rdma.c
@@ -695,7 +695,9 @@ rpcrdma_connect_worker(struct work_struct *work)
 {
         struct rpcrdma_ep *ep =
                 container_of(work, struct rpcrdma_ep, rep_connect_worker.work);
-        struct rpc_xprt *xprt = ep->rep_xprt;
+        struct rpcrdma_xprt *r_xprt =
+                container_of(ep, struct rpcrdma_xprt, rx_ep);
+        struct rpc_xprt *xprt = &r_xprt->rx_xprt;
 
         spin_lock_bh(&xprt->transport_lock);
         if (++xprt->connect_cookie == 0)        /* maintain a reserved value */
diff --git a/net/sunrpc/xprtrdma/transport.c b/net/sunrpc/xprtrdma/transport.c
index ee5751326339..a487bde71b4a 100644
--- a/net/sunrpc/xprtrdma/transport.c
+++ b/net/sunrpc/xprtrdma/transport.c
@@ -376,8 +376,6 @@ xprt_setup_rdma(struct xprt_create *args)
          */
         INIT_DELAYED_WORK(&new_xprt->rx_connect_worker,
                           xprt_rdma_connect_worker);
-        new_ep->rep_func = rpcrdma_conn_func;
-        new_ep->rep_xprt = xprt;
 
         xprt_rdma_format_addresses(xprt);
         xprt->max_payload = rpcrdma_max_payload(new_xprt);
diff --git a/net/sunrpc/xprtrdma/verbs.c b/net/sunrpc/xprtrdma/verbs.c
index 71a071aaf0ab..c61bb61c4d13 100644
--- a/net/sunrpc/xprtrdma/verbs.c
+++ b/net/sunrpc/xprtrdma/verbs.c
@@ -154,7 +154,7 @@ rpcrdma_qp_async_error_upcall(struct ib_event *event, void *context)
                 event->device->name, context);
         if (ep->rep_connected == 1) {
                 ep->rep_connected = -EIO;
-                ep->rep_func(ep);
+                rpcrdma_conn_func(ep);
                 wake_up_all(&ep->rep_connect_wait);
         }
 }
@@ -169,7 +169,7 @@ rpcrdma_cq_async_error_upcall(struct ib_event *event, void *context)
                 event->device->name, context);
         if (ep->rep_connected == 1) {
                 ep->rep_connected = -EIO;
-                ep->rep_func(ep);
+                rpcrdma_conn_func(ep);
                 wake_up_all(&ep->rep_connect_wait);
         }
 }
@@ -474,7 +474,7 @@ connected:
                 dprintk("RPC:       %s: %sconnected\n",
                                         __func__, connstate > 0 ? "" : "dis");
                 ep->rep_connected = connstate;
-                ep->rep_func(ep);
+                rpcrdma_conn_func(ep);
                 wake_up_all(&ep->rep_connect_wait);
                 /*FALLTHROUGH*/
         default:
diff --git a/net/sunrpc/xprtrdma/xprt_rdma.h b/net/sunrpc/xprtrdma/xprt_rdma.h
index 3fcc92b0e3ca..657c370e48b9 100644
--- a/net/sunrpc/xprtrdma/xprt_rdma.h
+++ b/net/sunrpc/xprtrdma/xprt_rdma.h
@@ -87,8 +87,6 @@ struct rpcrdma_ep {
         wait_queue_head_t       rep_connect_wait;
         struct ib_sge           rep_pad;        /* holds zeroed pad */
         struct ib_mr            *rep_pad_mr;    /* holds zeroed pad */
-        void                    (*rep_func)(struct rpcrdma_ep *);
-        struct rpc_xprt         *rep_xprt;      /* for rep_func */
         struct rdma_conn_param  rep_remote_cma;
         struct sockaddr_storage rep_remote_addr;
         struct delayed_work     rep_connect_worker;