From c2fa7924213518240fba2078f3036ede10022b76 Mon Sep 17 00:00:00 2001 From: Timothy Day Date: Wed, 26 Feb 2025 00:07:50 -0500 Subject: [PATCH] LU-18753 ptlrpc: remove ptlrpcd_add_rqset() ptlrpcd_add_rqset() has no callers. Remove it. Fixes: 03f537c50b76 ("LU-2244 lov: remove unused bits from lov, osc") Test-Parameters: trivial Signed-off-by: Timothy Day Change-Id: Ica55c7559c0244af12bf1b47b350f8aeb0398f03 Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/58225 Tested-by: jenkins Tested-by: Maloo Reviewed-by: Aurelien Degremont Reviewed-by: Max Wang Reviewed-by: James Simmons Reviewed-by: Arshad Hussain Reviewed-by: Oleg Drokin --- lustre/include/lustre_net.h | 1 - lustre/ptlrpc/ptlrpcd.c | 43 ------------------------------------------- 2 files changed, 44 deletions(-) diff --git a/lustre/include/lustre_net.h b/lustre/include/lustre_net.h index ee5155d..b34c20f 100644 --- a/lustre/include/lustre_net.h +++ b/lustre/include/lustre_net.h @@ -2650,7 +2650,6 @@ void ptlrpcd_stop(struct ptlrpcd_ctl *pc, int force); void ptlrpcd_free(struct ptlrpcd_ctl *pc); void ptlrpcd_wake(struct ptlrpc_request *req); void ptlrpcd_add_req(struct ptlrpc_request *req); -void ptlrpcd_add_rqset(struct ptlrpc_request_set *set); int ptlrpcd_addref(void); void ptlrpcd_decref(void); diff --git a/lustre/ptlrpc/ptlrpcd.c b/lustre/ptlrpc/ptlrpcd.c index 9a91a374..55ab470 100644 --- a/lustre/ptlrpc/ptlrpcd.c +++ b/lustre/ptlrpc/ptlrpcd.c @@ -167,49 +167,6 @@ ptlrpcd_select_pc(struct ptlrpc_request *req) } /** - * Move all request from an existing request set to the ptlrpcd queue. - * All requests from the set must be in phase RQ_PHASE_NEW. - */ -void ptlrpcd_add_rqset(struct ptlrpc_request_set *set) -{ - struct list_head *tmp, *pos; - struct ptlrpcd_ctl *pc; - struct ptlrpc_request_set *new; - int count, i; - - pc = ptlrpcd_select_pc(NULL); - new = pc->pc_set; - - list_for_each_safe(pos, tmp, &set->set_requests) { - struct ptlrpc_request *req = - list_entry(pos, struct ptlrpc_request, - rq_set_chain); - - LASSERT(req->rq_phase == RQ_PHASE_NEW); - req->rq_set = new; - req->rq_queued_time = ktime_get_seconds(); - } - - spin_lock(&new->set_new_req_lock); - list_splice_init(&set->set_requests, &new->set_new_requests); - i = atomic_read(&set->set_remaining); - count = atomic_add_return(i, &new->set_new_count); - atomic_set(&set->set_remaining, 0); - spin_unlock(&new->set_new_req_lock); - if (count == i) { - wake_up(&new->set_waitq); - - /* - * XXX: It maybe unnecessary to wakeup all the partners. But to - * guarantee the async RPC can be processed ASAP, we have - * no other better choice. It maybe fixed in future. - */ - for (i = 0; i < pc->pc_npartners; i++) - wake_up(&pc->pc_partners[i]->pc_set->set_waitq); - } -} - -/** * Return transferred RPCs count. */ static int ptlrpcd_steal_rqset(struct ptlrpc_request_set *des, -- 1.8.3.1