From 7198cfebaa43584b558aa5ae672fe62cbd737d1a Mon Sep 17 00:00:00 2001 From: Jinshan Xiong Date: Mon, 27 Jul 2015 10:52:13 -0700 Subject: [PATCH] LU-6903 lov: call lov_object_find_cbdata() inside lock It should be called inside layout type lock otherwise the layout may change and hit assertion. Signed-off-by: Jinshan Xiong Change-Id: I61d8c2a4f770ee0b05428ac763fc0d0db833f289 Reviewed-on: http://review.whamcloud.com/15748 Tested-by: Jenkins Reviewed-by: John L. Hammond Reviewed-by: Henri Doreau Tested-by: Maloo Reviewed-by: Oleg Drokin --- lustre/lov/lov_object.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lustre/lov/lov_object.c b/lustre/lov/lov_object.c index a23400f..1aaf08f 100644 --- a/lustre/lov/lov_object.c +++ b/lustre/lov/lov_object.c @@ -1524,8 +1524,7 @@ static int lov_object_find_cbdata(const struct lu_env *env, ENTRY; /* call cl_object_find_cbdata for sub obj */ - rc = LOV_2DISPATCH_NOLOCK(cl2lov(obj), llo_find_cbdata, - env, obj, iter, data); + rc = LOV_2DISPATCH(cl2lov(obj), llo_find_cbdata, env, obj, iter, data); RETURN(rc); } -- 1.8.3.1