From 19c38f6c94ae161b1c52dcb02667b4bf06cadc85 Mon Sep 17 00:00:00 2001 From: Patrick Farrell Date: Mon, 6 Feb 2023 18:22:24 -0500 Subject: [PATCH] LU-16515 clio: Remove cl_page_size() cl_page_size() is just a function which does: 1 << PAGE_SHIFT and the kernel provides a macro for that - PAGE_SIZE. Maybe it didn't when this function was added, but it sure does now. So, remove cl_page_size(). Test-parameters: trivial Signed-off-by: Patrick Farrell Change-Id: I6c27f6db7cfec5d9054aab95beccffe3c2da02bb Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/49918 Tested-by: jenkins Tested-by: Maloo Reviewed-by: Andreas Dilger Reviewed-by: Sebastien Buisson Reviewed-by: Oleg Drokin --- lustre/include/cl_object.h | 1 - lustre/llite/rw26.c | 9 ++++----- lustre/llite/vvp_io.c | 2 +- lustre/lov/lov_page.c | 2 +- lustre/obdclass/cl_page.c | 6 ------ 5 files changed, 6 insertions(+), 14 deletions(-) diff --git a/lustre/include/cl_object.h b/lustre/include/cl_object.h index 4e58394..7284109 100644 --- a/lustre/include/cl_object.h +++ b/lustre/include/cl_object.h @@ -2249,7 +2249,6 @@ void cl_page_touch(const struct lu_env *env, const struct cl_page *pg, size_t to); loff_t cl_offset(const struct cl_object *obj, pgoff_t idx); pgoff_t cl_index(const struct cl_object *obj, loff_t offset); -size_t cl_page_size(const struct cl_object *obj); void cl_lock_print(const struct lu_env *env, void *cookie, lu_printer_t printer, const struct cl_lock *lock); diff --git a/lustre/llite/rw26.c b/lustre/llite/rw26.c index c07c321..30da2b9 100644 --- a/lustre/llite/rw26.c +++ b/lustre/llite/rw26.c @@ -363,7 +363,6 @@ ll_direct_rw_pages(const struct lu_env *env, struct cl_io *io, size_t size, struct cl_sync_io *anchor = &sdio->csd_sync; loff_t offset = pv->ldp_file_offset; int io_pages = 0; - size_t page_size = cl_page_size(obj); int i; ssize_t rc = 0; @@ -404,12 +403,12 @@ ll_direct_rw_pages(const struct lu_env *env, struct cl_io *io, size_t size, * Set page clip to tell transfer formation engine * that page has to be sent even if it is beyond KMS. */ - if (size < page_size) + if (size < PAGE_SIZE) cl_page_clip(env, page, 0, size); ++io_pages; - offset += page_size; - size -= page_size; + offset += PAGE_SIZE; + size -= PAGE_SIZE; } if (rc == 0 && io_pages > 0) { int iot = rw == READ ? CRT_READ : CRT_WRITE; @@ -665,7 +664,7 @@ static int ll_prepare_partial_page(const struct lu_env *env, struct cl_io *io, if (attr->cat_kms <= offset) { char *kaddr = kmap_atomic(pg->cp_vmpage); - memset(kaddr, 0, cl_page_size(obj)); + memset(kaddr, 0, PAGE_SIZE); kunmap_atomic(kaddr); GOTO(out, result = 0); } diff --git a/lustre/llite/vvp_io.c b/lustre/llite/vvp_io.c index 1af0940..e19db59 100644 --- a/lustre/llite/vvp_io.c +++ b/lustre/llite/vvp_io.c @@ -1610,7 +1610,7 @@ static int vvp_io_fault_start(const struct lu_env *env, */ fio->ft_nob = size - cl_offset(obj, fio->ft_index); else - fio->ft_nob = cl_page_size(obj); + fio->ft_nob = PAGE_SIZE; lu_ref_add(&page->cp_reference, "fault", io); fio->ft_page = page; diff --git a/lustre/lov/lov_page.c b/lustre/lov/lov_page.c index 1c9cf7e..000f8ca 100644 --- a/lustre/lov/lov_page.c +++ b/lustre/lov/lov_page.c @@ -145,7 +145,7 @@ int lov_page_init_empty(const struct lu_env *env, struct cl_object *obj, page->cp_lov_index = CP_LOV_INDEX_EMPTY; addr = kmap(page->cp_vmpage); - memset(addr, 0, cl_page_size(obj)); + memset(addr, 0, PAGE_SIZE); kunmap(page->cp_vmpage); SetPageUptodate(page->cp_vmpage); RETURN(0); diff --git a/lustre/obdclass/cl_page.c b/lustre/obdclass/cl_page.c index 45b2cfe..42e1630 100644 --- a/lustre/obdclass/cl_page.c +++ b/lustre/obdclass/cl_page.c @@ -1155,12 +1155,6 @@ pgoff_t cl_index(const struct cl_object *obj, loff_t offset) } EXPORT_SYMBOL(cl_index); -size_t cl_page_size(const struct cl_object *obj) -{ - return 1UL << PAGE_SHIFT; -} -EXPORT_SYMBOL(cl_page_size); - /** * Adds page slice to the compound page. * -- 1.8.3.1