From d46845b97a193711c2acb725e217f0ba4ca625d6 Mon Sep 17 00:00:00 2001 From: Robert Baldyga Date: Wed, 9 Mar 2022 11:43:16 +0100 Subject: [PATCH 1/2] Remove unused error code Signed-off-by: Robert Baldyga --- inc/ocf_err.h | 3 --- tests/functional/pyocf/types/shared.py | 1 - 2 files changed, 4 deletions(-) diff --git a/inc/ocf_err.h b/inc/ocf_err.h index 68d6a05..ec53393 100644 --- a/inc/ocf_err.h +++ b/inc/ocf_err.h @@ -134,9 +134,6 @@ typedef enum { /** Core with the uuid already exists */ OCF_ERR_CORE_UUID_EXISTS, - /** Cache initialized with wrong metadata layout */ - OCF_ERR_METADATA_LAYOUT_MISMATCH, - /** Cache initialized with wrong cache line size */ OCF_ERR_CACHE_LINE_SIZE_MISMATCH, diff --git a/tests/functional/pyocf/types/shared.py b/tests/functional/pyocf/types/shared.py index e2855d7..f4e7c6c 100644 --- a/tests/functional/pyocf/types/shared.py +++ b/tests/functional/pyocf/types/shared.py @@ -52,7 +52,6 @@ class OcfErrorCode(IntEnum): OCF_ERR_CACHE_NAME_MISMATCH = auto() OCF_ERR_INVAL_CACHE_DEV = auto() OCF_ERR_CORE_UUID_EXISTS = auto() - OCF_ERR_METADATA_LAYOUT_MISMATCH = auto() OCF_ERR_CACHE_LINE_SIZE_MISMATCH = auto() OCF_ERR_CACHE_STANDBY = auto() OCF_ERR_CORE_SIZE_MISMATCH = auto() From 4fc3f8f0d11abc8a5c45fe8e365c851366be61b5 Mon Sep 17 00:00:00 2001 From: Robert Baldyga Date: Wed, 9 Mar 2022 11:44:23 +0100 Subject: [PATCH 2/2] Remove extra whitespace Signed-off-by: Robert Baldyga --- src/metadata/metadata_superblock.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/metadata/metadata_superblock.c b/src/metadata/metadata_superblock.c index 691e397..7a5760c 100644 --- a/src/metadata/metadata_superblock.c +++ b/src/metadata/metadata_superblock.c @@ -340,8 +340,8 @@ struct ocf_pipeline_properties ocf_metadata_load_sb_recov_pipeline_props = { .steps = { OCF_PL_STEP_FOREACH(ocf_metadata_store_segment, ocf_metadata_load_sb_store_segment_args), - OCF_PL_STEP_ARG_INT(ocf_metadata_load_segment, - metadata_segment_sb_config), + OCF_PL_STEP_ARG_INT(ocf_metadata_load_segment, + metadata_segment_sb_config), OCF_PL_STEP(_ocf_metadata_validate_superblock), OCF_PL_STEP_FOREACH(ocf_metadata_load_segment, ocf_metadata_load_sb_recov_load_segment_args),