Merge tag 'v6.0' into rdma.git for-next

[linux-block.git] / drivers / infiniband / ulp / rtrs / rtrs-srv.c

diff --git a/drivers/infiniband/ulp/rtrs/rtrs-srv.c b/drivers/infiniband/ulp/rtrs/rtrs-srv.c
index 4894e7329d88725c40166b4601d4c8fdf3c7bdaf..22d7ba05e9fe838b1fab5bde3e43b037d9b9bf0a 100644 (file)
--- a/drivers/infiniband/ulp/rtrs/rtrs-srv.c
+++ b/drivers/infiniband/ulp/rtrs/rtrs-srv.c
@@ -16,6 +16,7 @@
 #include "rtrs-log.h"
 #include <rdma/ib_cm.h>
 #include <rdma/ib_verbs.h>
+#include "rtrs-srv-trace.h"
 
 MODULE_DESCRIPTION("RDMA Transport Server");
 MODULE_LICENSE("GPL");
@@ -57,11 +58,6 @@ static inline struct rtrs_srv_con *to_srv_con(struct rtrs_con *c)
        return container_of(c, struct rtrs_srv_con, c);
 }
 
-static inline struct rtrs_srv_path *to_srv_path(struct rtrs_path *s)
-{
-       return container_of(s, struct rtrs_srv_path, s);
-}
-
 static bool rtrs_srv_change_state(struct rtrs_srv_path *srv_path,
                                  enum rtrs_srv_state new_state)
 {
@@ -375,6 +371,8 @@ static int send_io_resp_imm(struct rtrs_srv_con *con, struct rtrs_srv_op *id,
                }
        }
 
+       trace_send_io_resp_imm(id, need_inval, always_invalidate, errno);
+
        if (need_inval && always_invalidate) {
                wr = &inv_wr;
                inv_wr.next = &rwr.wr;
@@ -1024,7 +1022,7 @@ static void process_read(struct rtrs_srv_con *con,
        usr_len = le16_to_cpu(msg->usr_len);
        data_len = off - usr_len;
        data = page_address(srv->chunks[buf_id]);
-       ret = ctx->ops.rdma_ev(srv->priv, id, READ, data, data_len,
+       ret = ctx->ops.rdma_ev(srv->priv, id, data, data_len,
                           data + data_len, usr_len);
 
        if (ret) {
@@ -1077,7 +1075,7 @@ static void process_write(struct rtrs_srv_con *con,
        usr_len = le16_to_cpu(req->usr_len);
        data_len = off - usr_len;
        data = page_address(srv->chunks[buf_id]);
-       ret = ctx->ops.rdma_ev(srv->priv, id, WRITE, data, data_len,
+       ret = ctx->ops.rdma_ev(srv->priv, id, data, data_len,
                               data + data_len, usr_len);
        if (ret) {
                rtrs_err_rl(s,