From b9c84e331c13405fa3d994c45c5f3b2e2af656c5 Mon Sep 17 00:00:00 2001 From: Jan Musial Date: Fri, 10 Sep 2021 14:26:30 +0200 Subject: [PATCH] Fix attach with no cache_line_size specified Signed-off-by: Jan Musial --- src/mngt/ocf_mngt_cache.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/mngt/ocf_mngt_cache.c b/src/mngt/ocf_mngt_cache.c index a22feef..771549e 100644 --- a/src/mngt/ocf_mngt_cache.c +++ b/src/mngt/ocf_mngt_cache.c @@ -1036,7 +1036,8 @@ static void _ocf_mngt_init_properties(ocf_pipeline_t pipeline, context->metadata.shutdown_status = ocf_metadata_clean_shutdown; context->metadata.dirty_flushed = DIRTY_FLUSHED; - context->metadata.line_size = context->cfg.cache_line_size; + context->metadata.line_size = context->cfg.cache_line_size ?: + cache->metadata.line_size; ocf_pipeline_next(pipeline); } @@ -1071,9 +1072,6 @@ static void _ocf_mngt_attach_prepare_metadata(ocf_pipeline_t pipeline, ocf_cache_t cache = context->cache; int ret; - context->metadata.line_size = context->metadata.line_size ?: - cache->metadata.line_size; - /* * Initialize variable size metadata segments */ @@ -2193,7 +2191,7 @@ static void _ocf_mngt_activate_init_properties(ocf_pipeline_t pipeline, context->metadata.shutdown_status = ocf_metadata_dirty_shutdown; context->metadata.dirty_flushed = DIRTY_NOT_FLUSHED; - context->metadata.line_size = context->cfg.cache_line_size; + context->metadata.line_size = cache->metadata.line_size; ocf_pipeline_next(pipeline); }