Commit c5bc4bf0 authored by Michal Berger's avatar Michal Berger Committed by Tomasz Zawadzki
Browse files

lib/ftl: Set trace dependency only if DEBUG is enabled 



Entire ftl_trace.c seems to depend on CONFIG_DEBUG hence ftl's
dependencies should be adjusted based on that condition as well.

Change-Id: I27e19b8e533fd94833b6ed12261e2f696aead0b8
Signed-off-by: default avatarMichal Berger <michal.berger@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/21840


Reviewed-by: default avatarMateusz Kozlowski <mateusz.kozlowski@solidigm.com>
Reviewed-by: default avatarJim Harris <jim.harris@samsung.com>
Reviewed-by: default avatarKonrad Sztyber <konrad.sztyber@intel.com>
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Community-CI: Mellanox Build Bot
parent da094053

lib/ftl/Makefile

+4 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ FTL_SUBDIRS := mngt utils upgrade 


C_SRCS = ftl_core.c ftl_init.c ftl_layout.c ftl_debug.c ftl_io.c ftl_sb.c ftl_l2p.c ftl_l2p_flat.c

C_SRCS += ftl_nv_cache.c ftl_band.c ftl_band_ops.c ftl_writer.c ftl_rq.c ftl_reloc.c ftl_l2p_cache.c

C_SRCS += ftl_p2l.c ftl_trace.c

C_SRCS += ftl_p2l.c

C_SRCS += mngt/ftl_mngt.c mngt/ftl_mngt_bdev.c mngt/ftl_mngt_shutdown.c mngt/ftl_mngt_startup.c

C_SRCS += mngt/ftl_mngt_md.c mngt/ftl_mngt_misc.c mngt/ftl_mngt_ioch.c mngt/ftl_mngt_l2p.c

C_SRCS += mngt/ftl_mngt_band.c mngt/ftl_mngt_self_test.c mngt/ftl_mngt_p2l.c
@@ -39,6 +39,9 @@ C_SRCS += upgrade/ftl_band_upgrade.c upgrade/ftl_chunk_upgrade.c 
C_SRCS += upgrade/ftl_sb_v3.c upgrade/ftl_sb_v5.c

C_SRCS += nvc/ftl_nvc_dev.c nvc/ftl_nvc_bdev_vss.c

C_SRCS += base/ftl_base_dev.c base/ftl_base_bdev.c

ifeq ($(CONFIG_DEBUG),y)

C_SRCS += ftl_trace.c

endif



SPDK_MAP_FILE = $(abspath $(CURDIR)/spdk_ftl.map)

mk/spdk.lib_deps.mk

+4 −2
Original line number Diff line number Diff line
@@ -63,8 +63,10 @@ DEPDIRS-bdev := accel log util thread $(JSON_LIBS) notify trace dma 
DEPDIRS-blobfs := log thread blob trace util

DEPDIRS-event := log util thread $(JSON_LIBS) trace init

DEPDIRS-init := jsonrpc json log rpc thread util



DEPDIRS-ftl := log util thread bdev trace json jsonrpc

DEPDIRS-ftl := log util thread bdev json jsonrpc

ifeq ($(CONFIG_DEBUG),y)

DEPDIRS-ftl += trace

endif

DEPDIRS-nbd := log util thread $(JSON_LIBS) bdev

ifeq ($(CONFIG_UBLK),y)

DEPDIRS-ublk := log util thread $(JSON_LIBS) bdev