From: Andriy Skulysh Date: Sun, 29 Mar 2020 13:15:29 +0000 (+0300) Subject: LU-13994 ldlm: osc_object_ast_clear() is called for mdc object on eviction X-Git-Tag: 2.13.57~5 X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=commitdiff_plain;h=542d00591840607eb27e82a7decd00fe03213a88;hp=33dc40d58ef6eb8b384fce1da9f8d21cad4ef6d8 LU-13994 ldlm: osc_object_ast_clear() is called for mdc object on eviction Replace osc_object_prune() with cl_object_prune() PID: 3477 TASK: ffff9360d82fa0e0 CPU: 0 COMMAND: "ll_imp_inval" #0 [ffff9360d5c5b990] machine_kexec at ffffffff86865704 #1 [ffff9360d5c5b9f0] __crash_kexec at ffffffff869209a2 #2 [ffff9360d5c5bac0] panic at ffffffff86f7294c #3 [ffff9360d5c5bb40] lbug_with_loc at ffffffffc04b78cb [libcfs] #4 [ffff9360d5c5bb60] osc_object_ast_clear at ffffffffc0956471 [osc] #5 [ffff9360d5c5bbc8] ldlm_resource_foreach at ffffffffc07e2fd6 [ptlrpc] #6 [ffff9360d5c5bc08] ldlm_resource_iterate at ffffffffc07e3266 [ptlrpc] #7 [ffff9360d5c5bc38] osc_object_prune at ffffffffc0956140 [osc] #8 [ffff9360d5c5bc58] osc_object_invalidate at ffffffffc0956e12 [osc] #9 [ffff9360d5c5bcd0] osc_ldlm_resource_invalidate at ffffffffc09477bf [osc] Change-Id: I83fd02feb3f5559dfe7b93647429f8eb57c7ad0e HPE-bug-id: LUS-8399 Signed-off-by: Andriy Skulysh Reviewed-by: Alexander Boyko Reviewed-by: Vitaly Fertman Tested-by: Alexander Lezhoev Reviewed-on: https://review.whamcloud.com/40052 Reviewed-by: Alexander Boyko Tested-by: jenkins Reviewed-by: Vitaly Fertman Tested-by: Maloo Reviewed-by: Mike Pershin Reviewed-by: Oleg Drokin --- diff --git a/lustre/osc/osc_object.c b/lustre/osc/osc_object.c index ccb5bad..27ef908 100644 --- a/lustre/osc/osc_object.c +++ b/lustre/osc/osc_object.c @@ -496,7 +496,7 @@ int osc_object_invalidate(const struct lu_env *env, struct osc_object *osc) osc_lock_discard_pages(env, osc, 0, CL_PAGE_EOF, true); /* Clear ast data of dlm lock. Do this after discarding all pages */ - osc_object_prune(env, osc2cl(osc)); + cl_object_prune(env, osc2cl(osc)); RETURN(0); }