Commit cca2eab1 authored by Vitaliy Mysak's avatar Vitaliy Mysak Committed by Jim Harris
Browse files

ocf: allow loading cache without setting cache mode 



Make init_vbdev() accept NULL as cache_mode if loadq flag
  is set.
This is needed for load path because we don't know cache mode
  before the actual load (happens later).

This change is related to persistant metadata support.
This patch does not change current behavior because loadq flag
  is always false.

Change-Id: I42727eb841d87903c81bd5e6d51b6d4869ed9be3
Signed-off-by: default avatarVitaliy Mysak <vitaliy.mysak@intel.com>
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/455411


Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarDarek Stojaczyk <dariusz.stojaczyk@intel.com>
Reviewed-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
parent 2b1c1e70

lib/bdev/ocf/vbdev_ocf.c

+2 −2
Original line number Diff line number Diff line
@@ -671,7 +671,7 @@ vbdev_ocf_write_json_config(struct spdk_bdev *bdev, struct spdk_json_write_ctx * 
	spdk_json_write_named_object_begin(w, "params");

	spdk_json_write_named_string(w, "name", vbdev->name);

	spdk_json_write_named_string(w, "mode",

				     ocf_get_cache_modename(vbdev->cfg.cache.cache_mode));

				     ocf_get_cache_modename(ocf_cache_get_mode(vbdev->ocf_cache)));

	spdk_json_write_named_string(w, "cache_bdev_name", vbdev->cache.name);

	spdk_json_write_named_string(w, "core_bdev_name", vbdev->core.name);

	spdk_json_write_object_end(w);
@@ -1101,7 +1101,7 @@ init_vbdev(const char *vbdev_name, 
	if (cache_mode_name) {

		vbdev->cfg.cache.cache_mode

			= ocf_get_cache_mode(cache_mode_name);

	} else {

	} else if (!loadq) { /* In load path it is OK to pass NULL as cache mode */

		SPDK_ERRLOG("No cache mode specified\n");

		rc = -EINVAL;

		goto error_free;