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

Commit 42ab7353 authored by Bob Pearson's avatar Bob Pearson Committed by Greg Kroah-Hartman
Browse files

RDMA/rxe: Removed unused name from rxe_task struct 

[ Upstream commit de669ae8af49ceed0eed44f5b3d51dc62affc5e4 ]

The name field in struct rxe_task is never used. This patch removes it.

Link: https://lore.kernel.org/r/20221021200118.2163-4-rpearsonhpe@gmail.com


Signed-off-by: default avatarIan Ziemba <ian.ziemba@hpe.com>
Signed-off-by: default avatarBob Pearson <rpearsonhpe@gmail.com>
Signed-off-by: default avatarJason Gunthorpe <jgg@nvidia.com>
Stable-dep-of: 2a62b6210ce8 ("RDMA/rxe: Fix the use-before-initialization error of resp_pkts")
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent f99b6de5

drivers/infiniband/sw/rxe/rxe_qp.c

+3 −6
Original line number Diff line number Diff line
@@ -278,10 +278,8 @@ static int rxe_qp_init_req(struct rxe_dev *rxe, struct rxe_qp *qp, 


	skb_queue_head_init(&qp->req_pkts);



	rxe_init_task(&qp->req.task, qp,

		      rxe_requester, "req");

	rxe_init_task(&qp->comp.task, qp,

		      rxe_completer, "comp");

	rxe_init_task(&qp->req.task, qp, rxe_requester);

	rxe_init_task(&qp->comp.task, qp, rxe_completer);



	qp->qp_timeout_jiffies = 0; /* Can't be set for UD/UC in modify_qp */

	if (init->qp_type == IB_QPT_RC) {
@@ -327,8 +325,7 @@ static int rxe_qp_init_resp(struct rxe_dev *rxe, struct rxe_qp *qp, 


	skb_queue_head_init(&qp->resp_pkts);



	rxe_init_task(&qp->resp.task, qp,

		      rxe_responder, "resp");

	rxe_init_task(&qp->resp.task, qp, rxe_responder);



	qp->resp.opcode		= OPCODE_NONE;

	qp->resp.msn		= 0;

drivers/infiniband/sw/rxe/rxe_task.c

+1 −3
Original line number Diff line number Diff line
@@ -114,12 +114,10 @@ void rxe_do_task(unsigned long data) 
	task->ret = ret;

}



int rxe_init_task(struct rxe_task *task,

		  void *arg, int (*func)(void *), char *name)

int rxe_init_task(struct rxe_task *task, void *arg, int (*func)(void *))

{

	task->arg	= arg;

	task->func	= func;

	snprintf(task->name, sizeof(task->name), "%s", name);

	task->destroyed	= false;



	tasklet_init(&task->tasklet, rxe_do_task, (unsigned long)task);

drivers/infiniband/sw/rxe/rxe_task.h

+1 −3
Original line number Diff line number Diff line
@@ -52,7 +52,6 @@ struct rxe_task { 
	void			*arg;

	int			(*func)(void *arg);

	int			ret;

	char			name[16];

	bool			destroyed;

};
@@ -61,8 +60,7 @@ struct rxe_task { 
 *	arg  => parameter to pass to fcn

 *	fcn  => function to call until it returns != 0

 */

int rxe_init_task(struct rxe_task *task,

		  void *arg, int (*func)(void *), char *name);

int rxe_init_task(struct rxe_task *task, void *arg, int (*func)(void *));



/* cleanup task */

void rxe_cleanup_task(struct rxe_task *task);