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 <green@whamcloud.com>
Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/52485
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: Andreas Dilger <adilger@whamcloud.com>
Reviewed-by: Qian Yingjin <qian@ddn.com>

diff --git a/lustre/include/cl_object.h b/lustre/include/cl_object.h
index fbfd642..4946a15 100644 (file)
--- 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 (file)
--- 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 (file)
--- 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);