[lustre-devel] [PATCH 20/40] lustre: clio: Remove cl_page_size()

From: Patrick Farrell <[email protected]>

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().

WC-bug-id: https://jira.whamcloud.com/browse/LU-16515
Lustre-commit: 19c38f6c94ae161b1 ("LU-16515 clio: Remove cl_page_size()")
Signed-off-by: Patrick Farrell <[email protected]>
Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/49918
Reviewed-by: Andreas Dilger <[email protected]>
Reviewed-by: Sebastien Buisson <[email protected]>
Reviewed-by: Oleg Drokin <[email protected]>
Signed-off-by: James Simmons <[email protected]>
---
 fs/lustre/include/cl_object.h | 1 -
 fs/lustre/llite/rw26.c        | 9 ++++-----
 fs/lustre/llite/vvp_io.c      | 2 +-
 fs/lustre/lov/lov_page.c      | 2 +-
 fs/lustre/obdclass/cl_page.c  | 6 ------
 5 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/fs/lustre/include/cl_object.h b/fs/lustre/include/cl_object.h
index 41ce0b0..8a98413 100644
--- a/fs/lustre/include/cl_object.h
+++ b/fs/lustre/include/cl_object.h
@@ -2268,7 +2268,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);
 int cl_pages_prune(const struct lu_env *env, struct cl_object *obj);
 
 void cl_lock_print(const struct lu_env *env, void *cookie,
diff --git a/fs/lustre/llite/rw26.c b/fs/lustre/llite/rw26.c
index 6700717..6b338b2 100644
--- a/fs/lustre/llite/rw26.c
+++ b/fs/lustre/llite/rw26.c
@@ -218,7 +218,6 @@ static unsigned long ll_iov_iter_alignment(struct iov_iter *i)
 	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;
 
@@ -257,12 +256,12 @@ static unsigned long ll_iov_iter_alignment(struct iov_iter *i)
 		 * 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;
@@ -478,7 +477,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);
 		result = 0;
 		goto out;
diff --git a/fs/lustre/llite/vvp_io.c b/fs/lustre/llite/vvp_io.c
index 2da74a2..561ce66 100644
--- a/fs/lustre/llite/vvp_io.c
+++ b/fs/lustre/llite/vvp_io.c
@@ -1525,7 +1525,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/fs/lustre/lov/lov_page.c b/fs/lustre/lov/lov_page.c
index 6e28e62..e9283aa 100644
--- a/fs/lustre/lov/lov_page.c
+++ b/fs/lustre/lov/lov_page.c
@@ -144,7 +144,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/fs/lustre/obdclass/cl_page.c b/fs/lustre/obdclass/cl_page.c
index 62d8ee5..8320293 100644
--- a/fs/lustre/obdclass/cl_page.c
+++ b/fs/lustre/obdclass/cl_page.c
@@ -1035,12 +1035,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

_______________________________________________
lustre-devel mailing list
[email protected]
http://lists.lustre.org/listinfo.cgi/lustre-devel-lustre.org