From: John L. Hammond Date: Thu, 19 May 2022 18:06:30 +0000 (-0500) Subject: LU-10994 clio: remove unused convenience functions X-Git-Tag: 2.15.52~21 X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=commitdiff_plain;h=27e19a5420ae3ec22d8f3fe7f0e7794676479540 LU-10994 clio: remove unused convenience functions Remove the unused convenience functions cl_page_top(), cl_page_at(), cl_page_at_trusted(), and cl2vm_page(). Signed-off-by: John L. Hammond Change-Id: I9c994d8f4c81bc93383a9eb46def514685a27690 Reviewed-on: https://review.whamcloud.com/47401 Reviewed-by: Patrick Farrell Reviewed-by: Bobi Jam Tested-by: jenkins Tested-by: Maloo Reviewed-by: James Simmons Reviewed-by: Oleg Drokin --- diff --git a/lustre/include/cl_object.h b/lustre/include/cl_object.h index db21536..b8b3c51 100644 --- a/lustre/include/cl_object.h +++ b/lustre/include/cl_object.h @@ -2196,10 +2196,6 @@ void cl_page_header_print(const struct lu_env *env, void *cookie, lu_printer_t printer, const struct cl_page *pg); struct cl_page *cl_vmpage_page (struct page *vmpage, struct cl_object *obj); -struct cl_page *cl_page_top (struct cl_page *page); - -const struct cl_page_slice *cl_page_at(const struct cl_page *page, - const struct lu_device_type *dtype); /** * \name ownership diff --git a/lustre/llite/vvp_internal.h b/lustre/llite/vvp_internal.h index acba772..40648c4 100644 --- a/lustre/llite/vvp_internal.h +++ b/lustre/llite/vvp_internal.h @@ -249,11 +249,6 @@ static inline struct inode *vvp_object_inode(const struct cl_object *obj) int vvp_object_invariant(const struct cl_object *obj); struct vvp_object *cl_inode2vvp(struct inode *inode); -static inline struct page *cl2vm_page(const struct cl_page_slice *slice) -{ - return slice->cpl_page->cp_vmpage; -} - #ifdef CONFIG_LUSTRE_DEBUG_EXPENSIVE_CHECK # define CLOBINVRNT(env, clob, expr) \ do { \ diff --git a/lustre/obdclass/cl_page.c b/lustre/obdclass/cl_page.c index 9962de4..5ce6759 100644 --- a/lustre/obdclass/cl_page.c +++ b/lustre/obdclass/cl_page.c @@ -145,29 +145,6 @@ cl_page_slice_get(const struct cl_page *cl_page, int index) slice = cl_page_slice_get(cl_page, i); i >= 0; \ slice = cl_page_slice_get(cl_page, --i)) -/** - * Returns a slice within a cl_page, corresponding to the given layer in the - * device stack. - * - * \see cl_lock_at() - */ -static const struct cl_page_slice * -cl_page_at_trusted(const struct cl_page *cl_page, - const struct lu_device_type *dtype) -{ - const struct cl_page_slice *slice; - int i; - - ENTRY; - - cl_page_slice_for_each(cl_page, slice, i) { - if (slice->cpl_obj->co_lu.lo_dev->ld_type == dtype) - RETURN(slice); - } - - RETURN(NULL); -} - static void __cl_page_free(struct cl_page *cl_page, unsigned short bufsize) { int index = cl_page->cp_kmem_index; @@ -552,13 +529,6 @@ struct cl_page *cl_vmpage_page(struct page *vmpage, struct cl_object *obj) } EXPORT_SYMBOL(cl_vmpage_page); -const struct cl_page_slice *cl_page_at(const struct cl_page *page, - const struct lu_device_type *dtype) -{ - return cl_page_at_trusted(page, dtype); -} -EXPORT_SYMBOL(cl_page_at); - static void cl_page_owner_clear(struct cl_page *page) { ENTRY;