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

Commit 41179e2d authored by Roland Dreier's avatar Roland Dreier
Browse files

IB/iser: Make a couple of functions static 



Make iser_conn_release() and iser_start_rdma_unaligned_sg() static,
since they are only used in the .c file where they are defined.  In
addition to being a cleanup, this even shrinks the generated code by
allowing the single call of iser_start_rdma_unaligned_sg() to be
inlined into its callsite.  On x86_64:

add/remove: 0/1 grow/shrink: 1/0 up/down: 466/-533 (-67)
function                                     old     new   delta
iser_reg_rdma_mem                           1518    1984    +466
iser_start_rdma_unaligned_sg                 533       -    -533

Signed-off-by: default avatarRoland Dreier <rolandd@cisco.com>
parent e4daf738

drivers/infiniband/ulp/iser/iscsi_iser.h

+0 −5
Original line number Diff line number Diff line
@@ -310,8 +310,6 @@ int iser_conn_init(struct iser_conn **ib_conn); 


void iser_conn_terminate(struct iser_conn *ib_conn);



void iser_conn_release(struct iser_conn *ib_conn);



void iser_rcv_completion(struct iser_desc *desc,

			 unsigned long    dto_xfer_len);
@@ -329,9 +327,6 @@ void iser_reg_single(struct iser_device *device, 
		     struct iser_regd_buf    *regd_buf,

		     enum dma_data_direction direction);



int  iser_start_rdma_unaligned_sg(struct iscsi_iser_cmd_task    *ctask,

				  enum iser_data_dir            cmd_dir);



void iser_finalize_rdma_unaligned_sg(struct iscsi_iser_cmd_task *ctask,

				     enum iser_data_dir         cmd_dir);

drivers/infiniband/ulp/iser/iser_memory.c

+2 −2
Original line number Diff line number Diff line
@@ -103,7 +103,7 @@ void iser_reg_single(struct iser_device *device, 
/**

 * iser_start_rdma_unaligned_sg

 */

int iser_start_rdma_unaligned_sg(struct iscsi_iser_cmd_task  *iser_ctask,

static int iser_start_rdma_unaligned_sg(struct iscsi_iser_cmd_task *iser_ctask,

					enum iser_data_dir cmd_dir)

{

	int dma_nents;

drivers/infiniband/ulp/iser/iser_verbs.c

+23 −24
Original line number Diff line number Diff line
@@ -310,6 +310,29 @@ static int iser_conn_state_comp_exch(struct iser_conn *ib_conn, 
	return ret;

}



/**

 * Frees all conn objects and deallocs conn descriptor

 */

static void iser_conn_release(struct iser_conn *ib_conn)

{

	struct iser_device  *device = ib_conn->device;



	BUG_ON(ib_conn->state != ISER_CONN_DOWN);



	mutex_lock(&ig.connlist_mutex);

	list_del(&ib_conn->conn_list);

	mutex_unlock(&ig.connlist_mutex);



	iser_free_ib_conn_res(ib_conn);

	ib_conn->device = NULL;

	/* on EVENT_ADDR_ERROR there's no device yet for this conn */

	if (device != NULL)

		iser_device_try_release(device);

	if (ib_conn->iser_conn)

		ib_conn->iser_conn->ib_conn = NULL;

	kfree(ib_conn);

}



/**

 * triggers start of the disconnect procedures and wait for them to be done

 */
@@ -549,30 +572,6 @@ connect_failure: 
	return err;

}



/**

 * Frees all conn objects and deallocs conn descriptor

 */

void iser_conn_release(struct iser_conn *ib_conn)

{

	struct iser_device  *device = ib_conn->device;



	BUG_ON(ib_conn->state != ISER_CONN_DOWN);



	mutex_lock(&ig.connlist_mutex);

	list_del(&ib_conn->conn_list);

	mutex_unlock(&ig.connlist_mutex);



	iser_free_ib_conn_res(ib_conn);

	ib_conn->device = NULL;

	/* on EVENT_ADDR_ERROR there's no device yet for this conn */

	if (device != NULL)

		iser_device_try_release(device);

	if (ib_conn->iser_conn)

		ib_conn->iser_conn->ib_conn = NULL;

	kfree(ib_conn);

}





/**

 * iser_reg_page_vec - Register physical memory

 *