Commit 25d26b91 authored by Maciej Szwed's avatar Maciej Szwed Committed by Ben Walker
Browse files

ftl: Make FTL bdev a part of NVMe bdev 



This is a beginning of series that will provide
common code for all NVMe based bdevs.

Signed-off-by: default avatarMaciej Szwed <maciej.szwed@intel.com>
Change-Id: I097b4a03ef79277659f45d217c7e4e58236c98bf

Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/445893


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: default avatarWojciech Malikowski <wojciech.malikowski@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
parent 0871b382

lib/bdev/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -62,6 +62,5 @@ DIRS-$(CONFIG_PMDK) += pmem 
endif



DIRS-$(CONFIG_RBD) += rbd

DIRS-$(CONFIG_FTL) += ftl



include $(SPDK_ROOT_DIR)/mk/spdk.lib.mk

lib/bdev/ftl/Makefile

deleted100644 → 0
+0 −40
Original line number Diff line number Diff line 
#

#  BSD LICENSE

#

#  Copyright (c) Intel Corporation.

#  All rights reserved.

#

#  Redistribution and use in source and binary forms, with or without

#  modification, are permitted provided that the following conditions

#  are met:

#

#    * Redistributions of source code must retain the above copyright

#      notice, this list of conditions and the following disclaimer.

#    * Redistributions in binary form must reproduce the above copyright

#      notice, this list of conditions and the following disclaimer in

#      the documentation and/or other materials provided with the

#      distribution.

#    * Neither the name of Intel Corporation nor the names of its

#      contributors may be used to endorse or promote products derived

#      from this software without specific prior written permission.

#

#  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS

#  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT

#  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR

#  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT

#  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,

#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT

#  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,

#  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY

#  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT

#  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE

#  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

#



SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..)

include $(SPDK_ROOT_DIR)/mk/spdk.common.mk



C_SRCS = bdev_ftl.c bdev_ftl_rpc.c

LIBNAME = bdev_ftl



include $(SPDK_ROOT_DIR)/mk/spdk.lib.mk

lib/bdev/nvme/Makefile

+4 −0
Original line number Diff line number Diff line
@@ -37,4 +37,8 @@ include $(SPDK_ROOT_DIR)/mk/spdk.common.mk 
C_SRCS = bdev_nvme.c bdev_nvme_rpc.c nvme_rpc.c

LIBNAME = bdev_nvme



ifeq ($(CONFIG_FTL),y)

C_SRCS += bdev_ftl.c bdev_ftl_rpc.c

endif



include $(SPDK_ROOT_DIR)/mk/spdk.lib.mk

lib/bdev/ftl/bdev_ftl.c→lib/bdev/nvme/bdev_ftl.c

+0 −0

File moved.

View file

lib/bdev/ftl/bdev_ftl.h→lib/bdev/nvme/bdev_ftl.h

+0 −0

File moved.

View file