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

Commit 2853c2b6 authored by Nicholas Bellinger's avatar Nicholas Bellinger
Browse files

iser-target: Move INIT_WORK setup into isert_create_device_ib_res 



This patch moves INIT_WORK setup for cq_desc->cq_[rx,tx]_work into
isert_create_device_ib_res(), instead of being done each callback
invocation in isert_cq_[rx,tx]_callback().

This also fixes a 'INFO: trying to register non-static key' warning
when cancel_work_sync() is called before INIT_WORK has setup the
struct work_struct.

Reported-by: default avatarOr Gerlitz <ogerlitz@mellanox.com>
Cc: <stable@vger.kernel.org> #3.12+
Signed-off-by: default avatarNicholas Bellinger <nab@linux-iscsi.org>
parent db6077fd

drivers/infiniband/ulp/isert/ib_isert.c

+4 −2
Original line number Diff line number Diff line
@@ -207,7 +207,9 @@ isert_free_rx_descriptors(struct isert_conn *isert_conn) 
	isert_conn->conn_rx_descs = NULL;

}



static void isert_cq_tx_work(struct work_struct *);

static void isert_cq_tx_callback(struct ib_cq *, void *);

static void isert_cq_rx_work(struct work_struct *);

static void isert_cq_rx_callback(struct ib_cq *, void *);



static int
@@ -259,6 +261,7 @@ isert_create_device_ib_res(struct isert_device *device) 
		cq_desc[i].device = device;

		cq_desc[i].cq_index = i;



		INIT_WORK(&cq_desc[i].cq_rx_work, isert_cq_rx_work);

		device->dev_rx_cq[i] = ib_create_cq(device->ib_device,

						isert_cq_rx_callback,

						isert_cq_event_callback,
@@ -270,6 +273,7 @@ isert_create_device_ib_res(struct isert_device *device) 
			goto out_cq;

		}



		INIT_WORK(&cq_desc[i].cq_tx_work, isert_cq_tx_work);

		device->dev_tx_cq[i] = ib_create_cq(device->ib_device,

						isert_cq_tx_callback,

						isert_cq_event_callback,
@@ -1732,7 +1736,6 @@ isert_cq_tx_callback(struct ib_cq *cq, void *context) 
{

	struct isert_cq_desc *cq_desc = (struct isert_cq_desc *)context;



	INIT_WORK(&cq_desc->cq_tx_work, isert_cq_tx_work);

	queue_work(isert_comp_wq, &cq_desc->cq_tx_work);

}
@@ -1776,7 +1779,6 @@ isert_cq_rx_callback(struct ib_cq *cq, void *context) 
{

	struct isert_cq_desc *cq_desc = (struct isert_cq_desc *)context;



	INIT_WORK(&cq_desc->cq_rx_work, isert_cq_rx_work);

	queue_work(isert_rx_wq, &cq_desc->cq_rx_work);

}