From ccdbe656be3baadaca6c00e4c98b86feadeedbc3 Mon Sep 17 00:00:00 2001 From: Tomasz Zawadzki Date: Mon, 12 Oct 2020 06:57:37 -0400 Subject: [PATCH] module/gpt: remove legacy config support This patch removes legacy config support in GPT bdev module. Please note that disabling probing only for GPT partition does not have a corresponding RPC. Similar functionality is possible for all bdev modules at once via `bdev_set_options --disable-auto-examine` RPC then followed by `bdev_examine` RPC for particular bdev. Signed-off-by: Tomasz Zawadzki Change-Id: I9a106b3dc0953166264b11c2e95c4433163fcd3c Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/4624 Reviewed-by: Jim Harris Reviewed-by: Ben Walker Reviewed-by: Aleksey Marchuk Reviewed-by: Paul Luse Tested-by: SPDK CI Jenkins --- CHANGELOG.md | 6 ++++++ mk/spdk.lib_deps.mk | 2 +- module/bdev/gpt/vbdev_gpt.c | 12 +----------- 3 files changed, 8 insertions(+), 12 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c9325fdca..cc4eacbf7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,12 @@ removed between a call to get its structure based on a name and actually opennin Updated DPDK submodule to DPDK 20.08. +### gpt + +Removed option to disable GPT probing via legacy configuration. Please use generic +bdev functionality to replicate the behavior. See `bdev_set_options --disable-auto-examine` +and `bdev_examine` RPC. + ### intel-ipsec-mb Updated intel-ipsec-mb submodule to v0.54 diff --git a/mk/spdk.lib_deps.mk b/mk/spdk.lib_deps.mk index 401c20ad8..c800843ce 100644 --- a/mk/spdk.lib_deps.mk +++ b/mk/spdk.lib_deps.mk @@ -123,7 +123,7 @@ DEPDIRS-sock_posix := log sock util DEPDIRS-sock_uring := log sock util # module/bdev -DEPDIRS-bdev_gpt := bdev conf json log thread util +DEPDIRS-bdev_gpt := bdev json log thread util DEPDIRS-bdev_error := $(BDEV_DEPS) DEPDIRS-bdev_lvol := $(BDEV_DEPS) lvol blob blob_bdev diff --git a/module/bdev/gpt/vbdev_gpt.c b/module/bdev/gpt/vbdev_gpt.c index 24cd23328..64c32c039 100644 --- a/module/bdev/gpt/vbdev_gpt.c +++ b/module/bdev/gpt/vbdev_gpt.c @@ -38,7 +38,6 @@ #include "gpt.h" -#include "spdk/conf.h" #include "spdk/endian.h" #include "spdk/env.h" #include "spdk/thread.h" @@ -90,8 +89,6 @@ struct gpt_io { struct spdk_bdev_io_wait_entry bdev_io_wait; }; -static bool g_gpt_disabled; - static void gpt_base_free(void *ctx) { @@ -519,13 +516,6 @@ vbdev_gpt_read_gpt(struct spdk_bdev *bdev) static int vbdev_gpt_init(void) { - struct spdk_conf_section *sp = spdk_conf_find_section(NULL, "Gpt"); - - if (sp && spdk_conf_section_get_boolval(sp, "Disable", false)) { - /* Disable Gpt probe */ - g_gpt_disabled = true; - } - return 0; } @@ -543,7 +533,7 @@ vbdev_gpt_examine(struct spdk_bdev *bdev) /* A bdev with fewer than 2 blocks cannot have a GPT. Block 0 has * the MBR and block 1 has the GPT header. */ - if (g_gpt_disabled || spdk_bdev_get_num_blocks(bdev) < 2) { + if (spdk_bdev_get_num_blocks(bdev) < 2) { spdk_bdev_module_examine_done(&gpt_if); return; }