Commit cff7652a authored by Arnd Bergmann's avatar Arnd Bergmann Committed by sanglipeng1
Browse files

RDMA/srpt: fix function pointer cast warnings 

stable inclusion
from stable-v5.10.211
commit a2d1e1f8f0649eab69dcb142e9d8fcb4d1d9419e
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/IAF2J4

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=a2d1e1f8f0649eab69dcb142e9d8fcb4d1d9419e



--------------------------------

[ Upstream commit eb5c7465c3240151cd42a55c7ace9da0026308a1 ]

clang-16 notices that srpt_qp_event() gets called through an incompatible
pointer here:

drivers/infiniband/ulp/srpt/ib_srpt.c:1815:5: error: cast from 'void (*)(struct ib_event *, struct srpt_rdma_ch *)' to 'void (*)(struct ib_event *, void *)' converts to incompatible function type [-Werror,-Wcast-function-type-strict]
 1815 |                 = (void(*)(struct ib_event *, void*))srpt_qp_event;

Change srpt_qp_event() to use the correct prototype and adjust the
argument inside of it.

Fixes: a42d985b ("ib_srpt: Initial SRP Target merge for v3.3-rc1")
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Link: https://lore.kernel.org/r/20240213100728.458348-1-arnd@kernel.org


Reviewed-by: default avatarBart Van Assche <bvanassche@acm.org>
Signed-off-by: default avatarLeon Romanovsky <leon@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
Signed-off-by: default avatarsanglipeng1 <sanglipeng1@jd.com>
parent 5ad8d051

drivers/infiniband/ulp/srpt/ib_srpt.c

+5 −4
Original line number Diff line number Diff line
@@ -214,10 +214,12 @@ static const char *get_ch_state_name(enum rdma_ch_state s) 
/**

 * srpt_qp_event - QP event callback function

 * @event: Description of the event that occurred.

 * @ch: SRPT RDMA channel.

 * @ptr: SRPT RDMA channel.

 */

static void srpt_qp_event(struct ib_event *event, struct srpt_rdma_ch *ch)

static void srpt_qp_event(struct ib_event *event, void *ptr)

{

	struct srpt_rdma_ch *ch = ptr;



	pr_debug("QP event %d on ch=%p sess_name=%s-%d state=%s\n",

		 event->event, ch, ch->sess_name, ch->qp->qp_num,

		 get_ch_state_name(ch->state));
@@ -1807,8 +1809,7 @@ static int srpt_create_ch_ib(struct srpt_rdma_ch *ch) 
	ch->cq_size = ch->rq_size + sq_size;



	qp_init->qp_context = (void *)ch;

	qp_init->event_handler

		= (void(*)(struct ib_event *, void*))srpt_qp_event;

	qp_init->event_handler = srpt_qp_event;

	qp_init->send_cq = ch->cq;

	qp_init->recv_cq = ch->cq;

	qp_init->sq_sig_type = IB_SIGNAL_REQ_WR;