From: Parinay Kondekar Date: Wed, 6 Jul 2016 01:03:03 +0000 (-0400) Subject: LU-7914 obdclass: Removed unused reference of cl_page_list_own() X-Git-Tag: 2.8.56~56 X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=commitdiff_plain;h=80a9ca6385fc8df64fa9f7fbd8fa14dfb40a609f LU-7914 obdclass: Removed unused reference of cl_page_list_own() cl_page_list_own() is unused and thus could be removed altogether. Change-Id: I57c88a484f5d624e413d1b555473819f8785dd05 Signed-off-by: Parinay Kondekar Reviewed-on: http://review.whamcloud.com/20886 Tested-by: Jenkins Tested-by: Maloo Reviewed-by: Dmitry Eremin Reviewed-by: James Simmons Reviewed-by: Frank Zago Reviewed-by: Oleg Drokin --- diff --git a/lustre/include/cl_object.h b/lustre/include/cl_object.h index f50fee7..dc33a43 100644 --- a/lustre/include/cl_object.h +++ b/lustre/include/cl_object.h @@ -714,8 +714,6 @@ enum cl_page_type { struct cl_page { /** Reference counter. */ atomic_t cp_ref; - /** Transfer error. */ - int cp_error; /** An object this page is a part of. Immutable after creation. */ struct cl_object *cp_obj; /** vmpage */ @@ -2364,8 +2362,6 @@ void cl_page_list_del (const struct lu_env *env, struct cl_page_list *plist, struct cl_page *page); void cl_page_list_disown (const struct lu_env *env, struct cl_io *io, struct cl_page_list *plist); -int cl_page_list_own (const struct lu_env *env, - struct cl_io *io, struct cl_page_list *plist); void cl_page_list_assume (const struct lu_env *env, struct cl_io *io, struct cl_page_list *plist); void cl_page_list_discard(const struct lu_env *env, diff --git a/lustre/obdclass/cl_io.c b/lustre/obdclass/cl_io.c index 5728ac0..602b5ac 100644 --- a/lustre/obdclass/cl_io.c +++ b/lustre/obdclass/cl_io.c @@ -1009,29 +1009,6 @@ void cl_page_list_fini(const struct lu_env *env, struct cl_page_list *plist) EXPORT_SYMBOL(cl_page_list_fini); /** - * Owns all pages in a queue. - */ -int cl_page_list_own(const struct lu_env *env, - struct cl_io *io, struct cl_page_list *plist) -{ - struct cl_page *page; - struct cl_page *temp; - int result; - - LINVRNT(plist->pl_owner == current); - - ENTRY; - result = 0; - cl_page_list_for_each_safe(page, temp, plist) { - if (cl_page_own(env, io, page) == 0) - result = result ?: page->cp_error; - else - cl_page_list_del(env, plist, page); - } - RETURN(result); -} - -/** * Assumes all pages in a queue. */ void cl_page_list_assume(const struct lu_env *env, diff --git a/lustre/obdclass/cl_page.c b/lustre/obdclass/cl_page.c index 9eb7962..65cf9fe 100644 --- a/lustre/obdclass/cl_page.c +++ b/lustre/obdclass/cl_page.c @@ -1012,9 +1012,9 @@ void cl_page_header_print(const struct lu_env *env, void *cookie, lu_printer_t printer, const struct cl_page *pg) { (*printer)(env, cookie, - "page@%p[%d %p %d %d %d %p]\n", + "page@%p[%d %p %d %d %p]\n", pg, atomic_read(&pg->cp_ref), pg->cp_obj, - pg->cp_state, pg->cp_error, pg->cp_type, + pg->cp_state, pg->cp_type, pg->cp_owner); } EXPORT_SYMBOL(cl_page_header_print);