diff options
| author |   Sagi Grimberg <sagig@mellanox.com> | 2015-11-04 10:50:32 +0200 |
|---|---|---|
| committer |   Christoph Hellwig <hch@lst.de> | 2015-12-11 14:10:51 -0800 |
| commit | 7edc5a999d6bec1b5ef4d363b78578c0a723ef69 (patch) | |
| tree | 8468e2461c3057c2f53f1c99d16017699d7003a8 | |
| parent | IB/iser: Use a dedicated descriptor for login (diff) | |
| download | linux-dev-7edc5a999d6bec1b5ef4d363b78578c0a723ef69.tar.xz linux-dev-7edc5a999d6bec1b5ef4d363b78578c0a723ef69.zip | |
IB/iser: Use helper for container_of
Nicer this way.
Signed-off-by: Sagi Grimberg <sagig@mellanox.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
| -rw-r--r-- | drivers/infiniband/ulp/iser/iscsi_iser.h | 6 | ||||
| -rw-r--r-- | drivers/infiniband/ulp/iser/iser_initiator.c | 3 | ||||
| -rw-r--r-- | drivers/infiniband/ulp/iser/iser_verbs.c | 6 |
3 files changed, 9 insertions, 6 deletions
diff --git a/drivers/infiniband/ulp/iser/iscsi_iser.h b/drivers/infiniband/ulp/iser/iscsi_iser.h index 10bba4c098bf..87030799270a 100644 --- a/drivers/infiniband/ulp/iser/iscsi_iser.h +++ b/drivers/infiniband/ulp/iser/iscsi_iser.h @@ -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 diff --git a/drivers/infiniband/ulp/iser/iser_initiator.c b/drivers/infiniband/ulp/iser/iser_initiator.c index 21f28c8dd844..21148b62d797 100644 --- a/drivers/infiniband/ulp/iser/iser_initiator.c +++ b/drivers/infiniband/ulp/iser/iser_initiator.c @@ -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; diff --git a/drivers/infiniband/ulp/iser/iser_verbs.c b/drivers/infiniband/ulp/iser/iser_verbs.c index 7eccfa7e82f6..67c4e341291d 100644 --- a/drivers/infiniband/ulp/iser/iser_verbs.c +++ b/drivers/infiniband/ulp/iser/iser_verbs.c @@ -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) |