Skip to content

Commit d484ed6

Browse files
verygreengregkh
authored andcommitted
staging/lustre/osc: Get rid of osc_page_protected()
There was a proper debugging function by that name that's long gone. The currently remaining shadow that always returns true is not really useful so it could be dropped along with all the asserts it is part of. Signed-off-by: Oleg Drokin <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent d4722fc commit d484ed6

File tree

1 file changed

+0
-22
lines changed

1 file changed

+0
-22
lines changed

drivers/staging/lustre/lustre/osc/osc_page.c

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -52,13 +52,6 @@ static int osc_lru_reserve(const struct lu_env *env, struct osc_object *obj,
5252
* @{
5353
*/
5454

55-
static int osc_page_protected(const struct lu_env *env,
56-
const struct osc_page *opg,
57-
enum cl_lock_mode mode, int unref)
58-
{
59-
return 1;
60-
}
61-
6255
/*****************************************************************************
6356
*
6457
* Page operations.
@@ -110,8 +103,6 @@ int osc_page_cache_add(const struct lu_env *env,
110103
struct osc_page *opg = cl2osc_page(slice);
111104
int result;
112105

113-
LINVRNT(osc_page_protected(env, opg, CLM_WRITE, 0));
114-
115106
osc_page_transfer_get(opg, "transfer\0cache");
116107
result = osc_queue_async_io(env, io, opg);
117108
if (result != 0)
@@ -214,8 +205,6 @@ static void osc_page_delete(const struct lu_env *env,
214205
struct osc_object *obj = cl2osc(opg->ops_cl.cpl_obj);
215206
int rc;
216207

217-
LINVRNT(osc_page_protected(env, opg, CLM_READ, 1));
218-
219208
CDEBUG(D_TRACE, "%p\n", opg);
220209
osc_page_transfer_put(env, opg);
221210
rc = osc_teardown_async_page(env, obj, opg);
@@ -254,8 +243,6 @@ static void osc_page_clip(const struct lu_env *env,
254243
struct osc_page *opg = cl2osc_page(slice);
255244
struct osc_async_page *oap = &opg->ops_oap;
256245

257-
LINVRNT(osc_page_protected(env, opg, CLM_READ, 0));
258-
259246
opg->ops_from = from;
260247
opg->ops_to = to;
261248
spin_lock(&oap->oap_lock);
@@ -269,8 +256,6 @@ static int osc_page_cancel(const struct lu_env *env,
269256
struct osc_page *opg = cl2osc_page(slice);
270257
int rc = 0;
271258

272-
LINVRNT(osc_page_protected(env, opg, CLM_READ, 0));
273-
274259
/* Check if the transferring against this page
275260
* is completed, or not even queued.
276261
*/
@@ -320,10 +305,6 @@ int osc_page_init(const struct lu_env *env, struct cl_object *obj,
320305
cl_page_slice_add(page, &opg->ops_cl, obj, index,
321306
&osc_page_ops);
322307
}
323-
/*
324-
* Cannot assert osc_page_protected() here as read-ahead
325-
* creates temporary pages outside of a lock.
326-
*/
327308
/* ops_inflight and ops_lru are the same field, but it doesn't
328309
* hurt to initialize it twice :-)
329310
*/
@@ -382,9 +363,6 @@ void osc_page_submit(const struct lu_env *env, struct osc_page *opg,
382363
struct osc_async_page *oap = &opg->ops_oap;
383364
struct osc_object *obj = oap->oap_obj;
384365

385-
LINVRNT(osc_page_protected(env, opg,
386-
crt == CRT_WRITE ? CLM_WRITE : CLM_READ, 1));
387-
388366
LASSERTF(oap->oap_magic == OAP_MAGIC, "Bad oap magic: oap %p, magic 0x%x\n",
389367
oap, oap->oap_magic);
390368
LASSERT(oap->oap_async_flags & ASYNC_READY);

0 commit comments

Comments
 (0)