Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7edc5a99 authored by Sagi Grimberg's avatar Sagi Grimberg Committed by Christoph Hellwig
Browse files

IB/iser: Use helper for container_of 



Nicer this way.

Signed-off-by: default avatarSagi Grimberg <sagig@mellanox.com>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
parent 0f512b34

drivers/infiniband/ulp/iser/iscsi_iser.h

+6 −0
Original line number Diff line number Diff line
@@ -731,4 +731,10 @@ iser_tx_next_wr(struct iser_tx_desc *tx_desc) 
	return cur_wr;

}



static inline struct iser_conn *

to_iser_conn(struct ib_conn *ib_conn)

{

	return container_of(ib_conn, struct iser_conn, ib_conn);

}



#endif

drivers/infiniband/ulp/iser/iser_initiator.c

+1 −2
Original line number Diff line number Diff line
@@ -559,8 +559,7 @@ void iser_rcv_completion(struct iser_rx_desc *rx_desc, 
			 unsigned long rx_xfer_len,

			 struct ib_conn *ib_conn)

{

	struct iser_conn *iser_conn = container_of(ib_conn, struct iser_conn,

						   ib_conn);

	struct iser_conn *iser_conn = to_iser_conn(ib_conn);

	struct iscsi_hdr *hdr;

	char *data;

	u64 rx_dma;

drivers/infiniband/ulp/iser/iser_verbs.c

+2 −4
Original line number Diff line number Diff line
@@ -461,8 +461,7 @@ void iser_free_fastreg_pool(struct ib_conn *ib_conn) 
 */

static int iser_create_ib_conn_res(struct ib_conn *ib_conn)

{

	struct iser_conn *iser_conn = container_of(ib_conn, struct iser_conn,

						   ib_conn);

	struct iser_conn *iser_conn = to_iser_conn(ib_conn);

	struct iser_device	*device;

	struct ib_device_attr *dev_attr;

	struct ib_qp_init_attr	init_attr;
@@ -1166,9 +1165,8 @@ static void 
iser_handle_comp_error(struct ib_conn *ib_conn,

		       struct ib_wc *wc)

{

	struct iser_conn *iser_conn = to_iser_conn(ib_conn);

	void *wr_id = (void *)(uintptr_t)wc->wr_id;

	struct iser_conn *iser_conn = container_of(ib_conn, struct iser_conn,

						   ib_conn);



	if (wc->status != IB_WC_WR_FLUSH_ERR)

		if (iser_conn->iscsi_conn)