Commit 6e9293ea authored by Tomasz Zawadzki's avatar Tomasz Zawadzki Committed by Daniel Verkamp
Browse files

blobcli: exclude vbdev_lvol from blobcli compilation 



At this time blobcli makes use of all the bdev modules
during compilation. Yet vbdev_lvol does examine,
that already creates bs_dev on a bdev and loads
blobstore for all devices where lvol store exists.
Since bs_dev cannot be created on device twice,
same as blobstore cannot be loaded twice.
It prevented blobcli from displaying information
for blobstore underlying lvol store.

This patch remove vbdev_lvol from list of bdev modules
for blobcli.

Change-Id: I144ba22ec28f7f315e768745f5dd0cbbe3bbad86
Signed-off-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-on: https://review.gerrithub.io/404832


Tested-by: default avatarSPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarDaniel Verkamp <daniel.verkamp@intel.com>
parent 6a30dd6f

examples/blob/cli/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -42,13 +42,13 @@ SPDK_LIB_LIST = event_bdev event_copy 
SPDK_LIB_LIST += blobfs blob bdev blob_bdev copy event util conf trace \

		log jsonrpc json rpc



LIBS += $(COPY_MODULES_LINKER_ARGS) $(BLOCKDEV_MODULES_LINKER_ARGS)

LIBS += $(COPY_MODULES_LINKER_ARGS) $(BLOCKDEV_NO_LVOL_MODULES_LINKER_ARGS)

LIBS += $(SPDK_LIB_LINKER_ARGS) $(ENV_LINKER_ARGS)



all : $(APP)

	@:



$(APP) : $(OBJS) $(SPDK_LIB_FILES) $(BLOCKDEV_MODULES_FILES) $(LINKER_MODULES) $(ENV_LIBS)

$(APP) : $(OBJS) $(SPDK_LIB_FILES) $(BLOCKDEV_NO_LVOL_MODULES_FILES) $(LINKER_MODULES) $(ENV_LIBS)

	$(LINK_C)



clean :

mk/spdk.modules.mk

+13 −3
Original line number Diff line number Diff line
@@ -31,10 +31,12 @@ 
#  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

#



BLOCKDEV_MODULES_LIST = bdev_malloc bdev_null bdev_nvme nvme vbdev_passthru vbdev_error vbdev_gpt vbdev_lvol vbdev_split



LVOL_MODULES_LIST = vbdev_lvol

# Modules below are added as dependency for vbdev_lvol

BLOCKDEV_MODULES_LIST += blob blob_bdev lvol

LVOL_MODULES_LIST += blob blob_bdev lvol



BLOCKDEV_MODULES_LIST = $(LVOL_MODULES_LIST)

BLOCKDEV_MODULES_LIST += bdev_malloc bdev_null bdev_nvme nvme vbdev_passthru vbdev_error vbdev_gpt vbdev_split



ifeq ($(CONFIG_RDMA),y)

BLOCKDEV_MODULES_DEPS += -libverbs -lrdmacm
@@ -81,6 +83,14 @@ BLOCKDEV_MODULES_LINKER_ARGS = -Wl,--whole-archive \ 


BLOCKDEV_MODULES_FILES = $(call spdk_lib_list_to_files,$(BLOCKDEV_MODULES_LIST))



BLOCKDEV_NO_LVOL_MODULES_LIST = $(filter-out $(LVOL_MODULES_LIST),$(BLOCKDEV_MODULES_LIST))

BLOCKDEV_NO_LVOL_MODULES_LINKER_ARGS = -Wl,--whole-archive \

			       $(BLOCKDEV_NO_LVOL_MODULES_LIST:%=-lspdk_%) \

			       -Wl,--no-whole-archive \

			       $(BLOCKDEV_MODULES_DEPS)



BLOCKDEV_NO_LVOL_MODULES_FILES = $(call spdk_lib_list_to_files,$(BLOCKDEV_NO_LVOL_MODULES_LIST))



COPY_MODULES_LINKER_ARGS = -Wl,--whole-archive \

			   $(COPY_MODULES_LIST:%=-lspdk_%) \

			   -Wl,--no-whole-archive \