From: Patrick Farrell Date: Mon, 15 Nov 2021 22:14:07 +0000 (-0500) Subject: LU-15233 llite: Remove extra cl_page_delete call X-Git-Tag: 2.15.59~156 X-Git-Url: https://git.whamcloud.com/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F83%2F45583%2F4;p=fs%2Flustre-release.git LU-15233 llite: Remove extra cl_page_delete call "LU-5108 osc: Performance tune for LRU" added a call to cl_page_delete to the page discard code used by the OSC lru shrinker. This seems to have been a mistake. cl_page_discard causes page invalidation, which calls ll_invalidatepage, which calls cl_page_delete if the page can be found. Since the page is locked here and ll_invalidatepage checks for the cl_page, this extra call to cl_pege_delete has probably never caused an issue. But it's extraneous and kind of weird, and misled me a bit when working on another bug. Let's remove it. Fixes: b117bc837c02 ("LU-5108 osc: Performance tune for LRU") Signed-off-by: Patrick Farrell Change-Id: I1380f532359ba949a0bbb8b53227a6c8e6491030 Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/45583 Tested-by: jenkins Tested-by: Maloo Reviewed-by: Andreas Dilger Reviewed-by: Qian Yingjin Reviewed-by: Oleg Drokin --- diff --git a/lustre/osc/osc_page.c b/lustre/osc/osc_page.c index a53e1bb..1030956 100644 --- a/lustre/osc/osc_page.c +++ b/lustre/osc/osc_page.c @@ -498,7 +498,6 @@ static void discard_pagevec(const struct lu_env *env, struct cl_io *io, struct cl_page *page = pvec[i]; LASSERT(cl_page_is_owned(page, io)); - cl_page_delete(env, page); cl_page_discard(env, io, page); cl_page_disown(env, io, page); cl_pagevec_put(env, page, pagevec);