RDMA/rxe: Remove the unused variable obj

[ Upstream commit f07853582d1f6ed282f8d9a0b1209a87dd761f58 ]

The member variable obj in struct rxe_task is not needed.
So remove it to save memory.

Link: https://lore.kernel.org/r/20220822011615.805603-4-yanjun.zhu@linux.dev
Signed-off-by: Zhu Yanjun <yanjun.zhu@linux.dev>
Reviewed-by: Li Zhijian <lizhijian@fujitsu.com>
Reviewed-by: Bob Pearson <rpearsonhpe@gmail.com>
Signed-off-by: Leon Romanovsky <leon@kernel.org>
Stable-dep-of: 2a62b6210ce8 ("RDMA/rxe: Fix the use-before-initialization error of resp_pkts")
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/infiniband/sw/rxe/rxe_qp.c b/drivers/infiniband/sw/rxe/rxe_qp.c
index 5dd9bcef5921a3df7b2d0650c78513ddad0d513b..5b59907594f75072f96078e7f0d3713c151d8079 100644 (file)
--- a/drivers/infiniband/sw/rxe/rxe_qp.c
+++ b/drivers/infiniband/sw/rxe/rxe_qp.c
@@ -278,9 +278,9 @@ static int rxe_qp_init_req(struct rxe_dev *rxe, struct rxe_qp *qp,
 
        skb_queue_head_init(&qp->req_pkts);
 
-       rxe_init_task(rxe, &qp->req.task, qp,
+       rxe_init_task(&qp->req.task, qp,
                      rxe_requester, "req");
-       rxe_init_task(rxe, &qp->comp.task, qp,
+       rxe_init_task(&qp->comp.task, qp,
                      rxe_completer, "comp");
 
        qp->qp_timeout_jiffies = 0; /* Can't be set for UD/UC in modify_qp */
@@ -327,7 +327,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(rxe, &qp->resp.task, qp,
+       rxe_init_task(&qp->resp.task, qp,
                      rxe_responder, "resp");
 
        qp->resp.opcode         = OPCODE_NONE;

diff --git a/drivers/infiniband/sw/rxe/rxe_task.c b/drivers/infiniband/sw/rxe/rxe_task.c
index 08f05ac5f5d526f94d48f5b68ae9512463c4bd15..ea7d5a69eb2a3e84e67a104d5658df3c1f07f09f 100644 (file)
--- a/drivers/infiniband/sw/rxe/rxe_task.c
+++ b/drivers/infiniband/sw/rxe/rxe_task.c
@@ -114,10 +114,9 @@ void rxe_do_task(unsigned long data)
        task->ret = ret;
 }
 
-int rxe_init_task(void *obj, struct rxe_task *task,
+int rxe_init_task(struct rxe_task *task,
                  void *arg, int (*func)(void *), char *name)
 {
-       task->obj       = obj;
        task->arg       = arg;
        task->func      = func;
        snprintf(task->name, sizeof(task->name), "%s", name);

diff --git a/drivers/infiniband/sw/rxe/rxe_task.h b/drivers/infiniband/sw/rxe/rxe_task.h
index 08ff42d451c621f98ba60595b1c8566effe0334f..e87ee072e317933ba95d6923494cb6df67cab935 100644 (file)
--- a/drivers/infiniband/sw/rxe/rxe_task.h
+++ b/drivers/infiniband/sw/rxe/rxe_task.h
@@ -46,7 +46,6 @@ enum {
  * called again.
  */
 struct rxe_task {
-       void                    *obj;
        struct tasklet_struct   tasklet;
        int                     state;
        spinlock_t              state_lock; /* spinlock for task state */
@@ -62,7 +61,7 @@ struct rxe_task {
  *     arg  => parameter to pass to fcn
  *     fcn  => function to call until it returns != 0
  */
-int rxe_init_task(void *obj, struct rxe_task *task,
+int rxe_init_task(struct rxe_task *task,
                  void *arg, int (*func)(void *), char *name);
 
 /* cleanup task */