From e43b0e5c0ccbacd8adf30713babd865b5a7c58c7 Mon Sep 17 00:00:00 2001 From: Jinshan Xiong Date: Sun, 15 Oct 2017 12:19:30 -0700 Subject: [PATCH] LU-9785 lov: take lov layout lock for I/O with ignore_layout A rule of thumb for taking lov layout configuration lock is if I/O is initiated from LLITE layer, it should grab the lock. If an I/O starts from the OSC layer, it won't be necessary because if the OSC object exists, layout reconfiguration will move forward. Right now CIT_MISC + ci_ignore_layout can identify the I/O from the OSC layer, I just use this in lov_io_init() for this purpose. In the future, an explicit bit may be defined for this. Signed-off-by: Jinshan Xiong Change-Id: I2fe37a957b5fb4161c4c723062f6469b915c1dd5 Reviewed-on: https://review.whamcloud.com/29638 Reviewed-by: Andreas Dilger Reviewed-by: Bobi Jam Reviewed-by: Fan Yong Tested-by: Jenkins Tested-by: Maloo Reviewed-by: Jinshan Xiong --- lustre/lov/lov_object.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/lustre/lov/lov_object.c b/lustre/lov/lov_object.c index 5c52b2c..5a285d0 100644 --- a/lustre/lov/lov_object.c +++ b/lustre/lov/lov_object.c @@ -1270,8 +1270,13 @@ int lov_io_init(const struct lu_env *env, struct cl_object *obj, PFID(lu_object_fid(&obj->co_lu)), io, io->ci_type, io->ci_ignore_layout, io->ci_verify_layout); + /* IO type CIT_MISC with ci_ignore_layout set are usually invoked from + * the OSC layer. It shouldn't take lov layout conf lock in that case, + * because as long as the OSC object exists, the layout can't be + * reconfigured. */ return LOV_2DISPATCH_MAYLOCK(cl2lov(obj), llo_io_init, - !io->ci_ignore_layout, env, obj, io); + !(io->ci_ignore_layout && io->ci_type == CIT_MISC), + env, obj, io); } /** -- 1.8.3.1