From: Sam Atkinson Date: Thu, 19 Mar 2020 14:14:57 +0000 (-0400) Subject: LU-13441 osd-zfs: remove OSD thread info cache size assertion X-Git-Tag: 2.13.54~182 X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=commitdiff_plain;h=209f920fcddcf216c9a56239823a6bcb62ed367b LU-13441 osd-zfs: remove OSD thread info cache size assertion Remove assertion which kept OSD thread info cache size under 1000. This assertion is hit when creating a file with more than 511 stripes. Signed-off-by: Samuel Atkinson Change-Id: If926ec6653cdd85fb654b2960bc0391442bc0674 Reviewed-on: https://review.whamcloud.com/38187 Reviewed-by: Alex Zhuravlev Tested-by: jenkins Tested-by: Maloo Reviewed-by: Andreas Dilger Reviewed-by: Oleg Drokin --- diff --git a/lustre/osd-zfs/osd_handler.c b/lustre/osd-zfs/osd_handler.c index ba29c08..1b9d0f4 100644 --- a/lustre/osd-zfs/osd_handler.c +++ b/lustre/osd-zfs/osd_handler.c @@ -743,7 +743,7 @@ static void osd_key_fini(const struct lu_context *ctx, if (idc != NULL) { LASSERT(info->oti_ins_cache_size > 0); - OBD_FREE(idc, sizeof(*idc) * info->oti_ins_cache_size); + OBD_FREE_LARGE(idc, sizeof(*idc) * info->oti_ins_cache_size); info->oti_ins_cache = NULL; info->oti_ins_cache_size = 0; } diff --git a/lustre/osd-zfs/osd_oi.c b/lustre/osd-zfs/osd_oi.c index e4244dc..f62a68c 100644 --- a/lustre/osd-zfs/osd_oi.c +++ b/lustre/osd-zfs/osd_oi.c @@ -1011,16 +1011,15 @@ struct osd_idmap_cache *osd_idc_add(const struct lu_env *env, if (unlikely(oti->oti_ins_cache_used >= oti->oti_ins_cache_size)) { i = oti->oti_ins_cache_size * 2; - LASSERT(i < 1000); if (i == 0) i = OSD_INS_CACHE_SIZE; - OBD_ALLOC(idc, sizeof(*idc) * i); + OBD_ALLOC_LARGE(idc, sizeof(*idc) * i); if (idc == NULL) return ERR_PTR(-ENOMEM); if (oti->oti_ins_cache != NULL) { memcpy(idc, oti->oti_ins_cache, oti->oti_ins_cache_used * sizeof(*idc)); - OBD_FREE(oti->oti_ins_cache, + OBD_FREE_LARGE(oti->oti_ins_cache, oti->oti_ins_cache_used * sizeof(*idc)); } oti->oti_ins_cache = idc;