Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma

[sfrench/cifs-2.6.git] / drivers / infiniband / ulp / rtrs / rtrs-pri.h

diff --git a/drivers/infiniband/ulp/rtrs/rtrs-pri.h b/drivers/infiniband/ulp/rtrs/rtrs-pri.h
index 78eac9a4f7035a79cdc54a1072bc2ac37dfa18bd..9a1e5c2ae55c0658718b2cae003bebcfaa7afc5d 100644 (file)
--- a/drivers/infiniband/ulp/rtrs/rtrs-pri.h
+++ b/drivers/infiniband/ulp/rtrs/rtrs-pri.h
@@ -90,7 +90,7 @@ struct rtrs_ib_dev {
 };
 
 struct rtrs_con {
-       struct rtrs_sess        *sess;
+       struct rtrs_path        *path;
        struct ib_qp            *qp;
        struct ib_cq            *cq;
        struct rdma_cm_id       *cm_id;
@@ -100,7 +100,7 @@ struct rtrs_con {
        atomic_t                sq_wr_avail;
 };
 
-struct rtrs_sess {
+struct rtrs_path {
        struct list_head        entry;
        struct sockaddr_storage dst_addr;
        struct sockaddr_storage src_addr;
@@ -229,11 +229,11 @@ struct rtrs_msg_conn_rsp {
 /**
  * struct rtrs_msg_info_req
  * @type:              @RTRS_MSG_INFO_REQ
- * @sessname:          Session name chosen by client
+ * @pathname:          Path name chosen by client
  */
 struct rtrs_msg_info_req {
        __le16          type;
-       u8              sessname[NAME_MAX];
+       u8              pathname[NAME_MAX];
        u8              reserved[15];
 };
 
@@ -313,19 +313,19 @@ int rtrs_iu_post_rdma_write_imm(struct rtrs_con *con, struct rtrs_iu *iu,
 
 int rtrs_post_recv_empty(struct rtrs_con *con, struct ib_cqe *cqe);
 
-int rtrs_cq_qp_create(struct rtrs_sess *sess, struct rtrs_con *con,
+int rtrs_cq_qp_create(struct rtrs_path *path, struct rtrs_con *con,
                      u32 max_send_sge, int cq_vector, int nr_cqe,
                      u32 max_send_wr, u32 max_recv_wr,
                      enum ib_poll_context poll_ctx);
 void rtrs_cq_qp_destroy(struct rtrs_con *con);
 
-void rtrs_init_hb(struct rtrs_sess *sess, struct ib_cqe *cqe,
+void rtrs_init_hb(struct rtrs_path *path, struct ib_cqe *cqe,
                  unsigned int interval_ms, unsigned int missed_max,
                  void (*err_handler)(struct rtrs_con *con),
                  struct workqueue_struct *wq);
-void rtrs_start_hb(struct rtrs_sess *sess);
-void rtrs_stop_hb(struct rtrs_sess *sess);
-void rtrs_send_hb_ack(struct rtrs_sess *sess);
+void rtrs_start_hb(struct rtrs_path *path);
+void rtrs_stop_hb(struct rtrs_path *path);
+void rtrs_send_hb_ack(struct rtrs_path *path);
 
 void rtrs_rdma_dev_pd_init(enum ib_pd_flags pd_flags,
                           struct rtrs_rdma_dev_pd *pool);