From 03a795efa44253e06d6feef0ad613f2da0269c5b Mon Sep 17 00:00:00 2001 From: Oleg Drokin Date: Sat, 23 Sep 2023 02:07:00 -0400 Subject: [PATCH] LU-16713 llite: remove unused ccc_unstable_waitq Previous patch removed the only waiter on this waitq, so there's no point in having it around. Change-Id: Iceb1da2fb8958ae0bd7b0f4241cb263d02ca6dbd Test-parameters: trivial Signed-off-by: Oleg Drokin Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/52485 Tested-by: jenkins Tested-by: Maloo Reviewed-by: Andreas Dilger Reviewed-by: Qian Yingjin --- lustre/include/cl_object.h | 5 ----- lustre/obdclass/cl_page.c | 1 - lustre/osc/osc_page.c | 2 -- 3 files changed, 8 deletions(-) diff --git a/lustre/include/cl_object.h b/lustre/include/cl_object.h index fbfd642..4946a15 100644 --- a/lustre/include/cl_object.h +++ b/lustre/include/cl_object.h @@ -2328,11 +2328,6 @@ struct cl_client_cache { */ atomic_long_t ccc_unstable_nr; /** - * Waitq for awaiting unstable pages to reach zero. - * Used at umounting time and signaled on BRW commit - */ - wait_queue_head_t ccc_unstable_waitq; - /** * Serialize max_cache_mb write operation */ struct mutex ccc_max_cache_mb_lock; diff --git a/lustre/obdclass/cl_page.c b/lustre/obdclass/cl_page.c index fe57fd8..32be17f 100644 --- a/lustre/obdclass/cl_page.c +++ b/lustre/obdclass/cl_page.c @@ -1189,7 +1189,6 @@ struct cl_client_cache *cl_cache_init(unsigned long lru_page_max) cache->ccc_unstable_check = 1; atomic_long_set(&cache->ccc_unstable_nr, 0); - init_waitqueue_head(&cache->ccc_unstable_waitq); mutex_init(&cache->ccc_max_cache_mb_lock); RETURN(cache); diff --git a/lustre/osc/osc_page.c b/lustre/osc/osc_page.c index 9012739..0e75597 100644 --- a/lustre/osc/osc_page.c +++ b/lustre/osc/osc_page.c @@ -978,8 +978,6 @@ void osc_dec_unstable_pages(struct ptlrpc_request *req) unstable_count = atomic_long_sub_return(page_count, &cli->cl_cache->ccc_unstable_nr); LASSERT(unstable_count >= 0); - if (unstable_count == 0) - wake_up(&cli->cl_cache->ccc_unstable_waitq); if (waitqueue_active(&osc_lru_waitq)) (void)ptlrpcd_queue_work(cli->cl_lru_work); -- 1.8.3.1