From: Oleg Drokin Date: Mon, 6 Jun 2016 03:28:52 +0000 (-0400) Subject: staging/lustre/osc: Remove ops_temp from osc_page X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=d4722fccbe78c2b45a0a534d8944247592eaefe7;p=openwrt%2Fstaging%2Fblogic.git staging/lustre/osc: Remove ops_temp from osc_page It's no longer used and never set anywhere. Signed-off-by: Oleg Drokin Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/lustre/lustre/osc/osc_cl_internal.h b/drivers/staging/lustre/lustre/osc/osc_cl_internal.h index ae19d396b537..7359fcb0d8c5 100644 --- a/drivers/staging/lustre/lustre/osc/osc_cl_internal.h +++ b/drivers/staging/lustre/lustre/osc/osc_cl_internal.h @@ -355,11 +355,6 @@ struct osc_page { * Boolean, true iff page is under transfer. Used for sanity checking. */ unsigned ops_transfer_pinned:1, - /** - * True for a `temporary page' created by read-ahead code, probably - * outside of any DLM lock. - */ - ops_temp:1, /** * in LRU? */ diff --git a/drivers/staging/lustre/lustre/osc/osc_page.c b/drivers/staging/lustre/lustre/osc/osc_page.c index c29c2eabe39c..fc3674388a1c 100644 --- a/drivers/staging/lustre/lustre/osc/osc_page.c +++ b/drivers/staging/lustre/lustre/osc/osc_page.c @@ -214,7 +214,7 @@ static void osc_page_delete(const struct lu_env *env, struct osc_object *obj = cl2osc(opg->ops_cl.cpl_obj); int rc; - LINVRNT(opg->ops_temp || osc_page_protected(env, opg, CLM_READ, 1)); + LINVRNT(osc_page_protected(env, opg, CLM_READ, 1)); CDEBUG(D_TRACE, "%p\n", opg); osc_page_transfer_put(env, opg);