From a56fefc535677b146b3c55752109d20b92c7be3e Mon Sep 17 00:00:00 2001 From: Andriy Skulysh Date: Tue, 16 Jun 2020 12:49:07 +0300 Subject: [PATCH] LU-13992 llite: ASSERTION( last_oap_count > 0 ) failed Punch uses o_blocks to send end of a region. So it can be mixed with real blocks count on error. Update blocks count only on success. Change-Id: I86241c4e5723079b20401805b853d356130f58d9 HPE-bug-id: LUS-7407 Test-Parameters: fstype=zfs Signed-off-by: Andriy Skulysh Reviewed-by: Andrew Perepechko Reviewed-by: Alexander Boyko Tested-by: Elena Gryaznova Reviewed-on: https://review.whamcloud.com/40050 Tested-by: jenkins Reviewed-by: Alexander Boyko Tested-by: Maloo Reviewed-by: Andreas Dilger Reviewed-by: Arshad Hussain Reviewed-by: Oleg Drokin --- lustre/osc/osc_io.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/lustre/osc/osc_io.c b/lustre/osc/osc_io.c index 67c162f..389363f 100644 --- a/lustre/osc/osc_io.c +++ b/lustre/osc/osc_io.c @@ -698,14 +698,17 @@ void osc_io_setattr_end(const struct lu_env *env, if (cl_io_is_trunc(io)) { __u64 size = io->u.ci_setattr.sa_attr.lvb_size; - cl_object_attr_lock(obj); - if (oa->o_valid & OBD_MD_FLBLOCKS) { - attr->cat_blocks = oa->o_blocks; - cl_valid |= CAT_BLOCKS; - } - cl_object_attr_update(env, obj, attr, cl_valid); - cl_object_attr_unlock(obj); + if (result == 0) { + cl_object_attr_lock(obj); + if (oa->o_valid & OBD_MD_FLBLOCKS) { + attr->cat_blocks = oa->o_blocks; + cl_valid |= CAT_BLOCKS; + } + + cl_object_attr_update(env, obj, attr, cl_valid); + cl_object_attr_unlock(obj); + } osc_trunc_check(env, io, oio, size); osc_cache_truncate_end(env, oio->oi_trunc); oio->oi_trunc = NULL; -- 1.8.3.1