From c2f548dacc5fd728539e7a411e5092bfa3e8cc2d Mon Sep 17 00:00:00 2001 From: Patrick Farrell Date: Mon, 8 May 2023 17:44:11 -0400 Subject: [PATCH] LU-16805 llite: improve readpage debug LU-16412 (which is a workaround for a kernel bug) added a debug message in ll_readpage(), but this message is printed every time rather than only when the kernel bug is hit. Let's fix this. Fixes: 209afbe28b "LU-16412 llite: check truncated page in ->readpage()" Test-parameters: trivial Signed-off-by: Patrick Farrell Change-Id: Ice02178eb9c07e03b58fb4e2d64ed3ea878cf137 Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/50892 Reviewed-by: Andreas Dilger Reviewed-by: Timothy Day Reviewed-by: Oleg Drokin Tested-by: jenkins Tested-by: Maloo --- lustre/llite/rw.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/lustre/llite/rw.c b/lustre/llite/rw.c index bdc0cd8..ef921eb 100644 --- a/lustre/llite/rw.c +++ b/lustre/llite/rw.c @@ -1977,9 +1977,6 @@ int ll_readpage(struct file *file, struct page *vmpage) } if (lcc && lcc->lcc_type != LCC_MMAP) { - CDEBUG(D_VFSTRACE, "pgno:%ld, beyond read end_index:%ld\n", - vmpage->index, lcc->lcc_end_index); - /* * This handles a kernel bug introduced in kernel 5.12: * comment: cbd59c48ae2bcadc4a7599c29cf32fd3f9b78251 @@ -2005,6 +2002,10 @@ int ll_readpage(struct file *file, struct page *vmpage) * mentioned above. */ if (vmpage->index >= lcc->lcc_end_index) { + CDEBUG(D_VFSTRACE, + "pgno:%ld, beyond read end_index:%ld\n", + vmpage->index, lcc->lcc_end_index); + result = cl_io_read_ahead(env, io, vmpage->index, &ra); if (result < 0 || vmpage->index > ra.cra_end_idx) { cl_read_ahead_release(env, &ra); -- 1.8.3.1