log: remove internal log.h header

There is nothing left here, so remove it.

Signed-off-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
Change-Id: Ib947d42bc577dbebb4650b1be885e05a80f8f8cf
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/4541
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Anil Veerabhadrappa <anil.veerabhadrappa@broadcom.com>
Reviewed-by: Aleksey Marchuk <alexeymar@mellanox.com>
Community-CI: Broadcom CI

include/spdk_internal/log.h

@@ -1,44 +0,0 @@
-/*-
- *   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.
- */
-
-/**
- * \file
- * Logging interfaces
- */
-
-#ifndef SPDK_INTERNAL_LOG_H
-#define SPDK_INTERNAL_LOG_H
-
-#include "spdk/log.h"
-
-#endif /* SPDK_INTERNAL_LOG_H */

include/spdk_internal/virtio.h

@@ -40,7 +40,7 @@
 #include <linux/virtio_pci.h>
 #include <linux/virtio_config.h>
 
-#include "spdk_internal/log.h"
+#include "spdk/log.h"
 #include "spdk/likely.h"
 #include "spdk/queue.h"
 #include "spdk/json.h"

lib/bdev/bdev.c

@@ -48,7 +48,7 @@
 #include "spdk/trace.h"
 
 #include "spdk/bdev_module.h"
-#include "spdk_internal/log.h"
+#include "spdk/log.h"
 #include "spdk/string.h"
 
 #include "bdev_internal.h"

lib/bdev/bdev_rpc.c

@@ -40,7 +40,7 @@
 #include "spdk/base64.h"
 #include "spdk/bdev_module.h"
 
-#include "spdk_internal/log.h"
+#include "spdk/log.h"
 
 struct spdk_rpc_set_bdev_opts {
 	uint32_t bdev_io_pool_size;

lib/blob/blobstore.c

@@ -45,7 +45,7 @@
 #include "spdk/string.h"
 
 #include "spdk_internal/assert.h"
-#include "spdk_internal/log.h"
+#include "spdk/log.h"
 
 #include "blobstore.h"
 

lib/blob/request.c

@@ -39,7 +39,7 @@
 #include "spdk/thread.h"
 #include "spdk/queue.h"
 
-#include "spdk_internal/log.h"
+#include "spdk/log.h"
 
 void
 bs_call_cpl(struct spdk_bs_cpl *cpl, int bserrno)

lib/blobfs/blobfs.c

@@ -42,7 +42,7 @@
 #include "spdk/assert.h"
 #include "spdk/env.h"
 #include "spdk/util.h"
-#include "spdk_internal/log.h"
+#include "spdk/log.h"
 #include "spdk/trace.h"
 
 #define BLOBFS_TRACE(file, str, args...) \

lib/blobfs/tree.c

@@ -39,7 +39,7 @@
 #include "spdk/queue.h"
 #include "spdk/assert.h"
 #include "spdk/env.h"
-#include "spdk_internal/log.h"
+#include "spdk/log.h"
 
 uint32_t g_fs_cache_buffer_shift = CACHE_BUFFER_SHIFT_DEFAULT;
 

lib/env_ocf/ocf_env.c

@@ -35,7 +35,7 @@
 
 #include "spdk/crc32.h"
 #include "spdk/env.h"
-#include "spdk_internal/log.h"
+#include "spdk/log.h"
 
 /* Number of buffers for mempool
  * Need to be power of two - 1 for better memory utilization

lib/env_ocf/ocf_env.h

@@ -49,7 +49,7 @@
 #include "spdk/likely.h"
 #include "spdk/env.h"
 #include "spdk/util.h"
-#include "spdk_internal/log.h"
+#include "spdk/log.h"
 
 #include "ocf_env_list.h"
 #include "ocf/ocf_err.h"

lib/event/app_rpc.c

@@ -40,7 +40,7 @@
 #include "spdk/env.h"
 #include "spdk/thread.h"
 
-#include "spdk_internal/log.h"
+#include "spdk/log.h"
 #include "spdk_internal/event.h"
 #include "spdk_internal/thread.h"
 

lib/event/json_config.c

@@ -42,7 +42,6 @@
 #include "spdk/rpc.h"
 
 #include "spdk_internal/event.h"
-#include "spdk_internal/log.h"
 
 #define SPDK_DEBUG_APP_CFG(...) SPDK_DEBUGLOG(app_config, __VA_ARGS__)
 

lib/event/log_rpc.c

@@ -34,7 +34,7 @@
 #include "spdk/rpc.h"
 #include "spdk/util.h"
 
-#include "spdk_internal/log.h"
+#include "spdk/log.h"
 
 struct rpc_log_flag {
 	char *flag;

lib/event/reactor.c

@@ -35,7 +35,6 @@
 #include "spdk/likely.h"
 
 #include "spdk_internal/event.h"
-#include "spdk_internal/log.h"
 #include "spdk_internal/thread.h"
 
 #include "spdk/log.h"

lib/ftl/ftl_core.c

@@ -37,7 +37,7 @@
 #include "spdk/thread.h"
 #include "spdk/bdev_module.h"
 #include "spdk/string.h"
-#include "spdk_internal/log.h"
+#include "spdk/log.h"
 #include "spdk/ftl.h"
 #include "spdk/crc32.h"
 

lib/ftl/ftl_core.h

@@ -38,7 +38,7 @@
 #include "spdk/uuid.h"
 #include "spdk/thread.h"
 #include "spdk/util.h"
-#include "spdk_internal/log.h"
+#include "spdk/log.h"
 #include "spdk/likely.h"
 #include "spdk/queue.h"
 #include "spdk/ftl.h"

lib/ftl/ftl_debug.c

@@ -31,7 +31,7 @@
  *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "spdk_internal/log.h"
+#include "spdk/log.h"
 #include "spdk/ftl.h"
 #include "ftl_debug.h"
 #include "ftl_band.h"

lib/ftl/ftl_init.c

@@ -36,7 +36,7 @@
 #include "spdk/thread.h"
 #include "spdk/string.h"
 #include "spdk/likely.h"
-#include "spdk_internal/log.h"
+#include "spdk/log.h"
 #include "spdk/ftl.h"
 #include "spdk/likely.h"
 #include "spdk/string.h"

lib/ftl/ftl_reloc.c

@@ -32,7 +32,7 @@
  */
 
 #include "spdk/likely.h"
-#include "spdk_internal/log.h"
+#include "spdk/log.h"
 #include "spdk/ftl.h"
 
 #include "ftl_reloc.h"

lib/idxd/idxd.c

@@ -38,7 +38,7 @@
 #include "spdk/util.h"
 #include "spdk/memory.h"
 
-#include "spdk_internal/log.h"
+#include "spdk/log.h"
 #include "spdk_internal/idxd.h"
 
 #include "idxd.h"

lib/ioat/ioat.c

@@ -39,7 +39,7 @@
 #include "spdk/util.h"
 #include "spdk/memory.h"
 
-#include "spdk_internal/log.h"
+#include "spdk/log.h"
 
 struct ioat_driver {
 	pthread_mutex_t			lock;

lib/iscsi/conn.c

@@ -44,7 +44,7 @@
 #include "spdk/sock.h"
 #include "spdk/string.h"
 
-#include "spdk_internal/log.h"
+#include "spdk/log.h"
 
 #include "iscsi/task.h"
 #include "iscsi/conn.h"

lib/iscsi/init_grp.c

@@ -37,7 +37,7 @@
 #include "spdk/conf.h"
 #include "spdk/string.h"
 
-#include "spdk_internal/log.h"
+#include "spdk/log.h"
 
 #include "iscsi/iscsi.h"
 #include "iscsi/init_grp.h"

lib/iscsi/iscsi.c

@@ -55,7 +55,7 @@
 #include "spdk/bdev.h"
 #include "iscsi/portal_grp.h"
 
-#include "spdk_internal/log.h"
+#include "spdk/log.h"
 
 #define MAX_TMPBUF 1024
 

lib/iscsi/iscsi_rpc.c

@@ -41,7 +41,7 @@
 #include "spdk/rpc.h"
 #include "spdk/util.h"
 #include "spdk/string.h"
-#include "spdk_internal/log.h"
+#include "spdk/log.h"
 
 static void
 rpc_iscsi_get_initiator_groups(struct spdk_jsonrpc_request *request,

lib/iscsi/iscsi_subsystem.c

@@ -45,7 +45,7 @@
 #include "iscsi/task.h"
 #include "iscsi/tgt_node.h"
 
-#include "spdk_internal/log.h"
+#include "spdk/log.h"
 
 struct spdk_iscsi_opts *g_spdk_iscsi_opts = NULL;
 

lib/iscsi/param.c

@@ -40,7 +40,7 @@
 #include "iscsi/conn.h"
 #include "spdk/string.h"
 
-#include "spdk_internal/log.h"
+#include "spdk/log.h"
 
 #define MAX_TMPBUF 1024
 

lib/iscsi/portal_grp.c

@@ -38,7 +38,7 @@
 #include "spdk/sock.h"
 #include "spdk/string.h"
 
-#include "spdk_internal/log.h"
+#include "spdk/log.h"
 
 #include "iscsi/iscsi.h"
 #include "iscsi/conn.h"

lib/iscsi/tgt_node.c

@@ -38,7 +38,7 @@
 #include "spdk/sock.h"
 #include "spdk/scsi.h"
 
-#include "spdk_internal/log.h"
+#include "spdk/log.h"
 
 #include "iscsi/iscsi.h"
 #include "iscsi/conn.h"

lib/json/json_util.c

@@ -34,7 +34,7 @@
 #include "spdk/json.h"
 
 #include "spdk_internal/utf.h"
-#include "spdk_internal/log.h"
+#include "spdk/log.h"
 
 #define SPDK_JSON_DEBUG(...) SPDK_DEBUGLOG(json_util, __VA_ARGS__)
 

lib/jsonrpc/jsonrpc_internal.h

@@ -38,7 +38,7 @@
 
 #include "spdk/jsonrpc.h"
 
-#include "spdk_internal/log.h"
+#include "spdk/log.h"
 
 #define SPDK_JSONRPC_RECV_BUF_SIZE	(32 * 1024)
 #define SPDK_JSONRPC_SEND_BUF_SIZE_INIT	(32 * 1024)

lib/log/log.c

@@ -33,7 +33,7 @@
 
 #include "spdk/stdinc.h"
 
-#include "spdk_internal/log.h"
+#include "spdk/log.h"
 
 static const char *const spdk_level_names[] = {
 	[SPDK_LOG_ERROR]	= "ERROR",

lib/log/log_flags.c

@@ -33,7 +33,7 @@
 
 #include "spdk/stdinc.h"
 
-#include "spdk_internal/log.h"
+#include "spdk/log.h"
 
 static TAILQ_HEAD(, spdk_log_flag) g_log_flags = TAILQ_HEAD_INITIALIZER(g_log_flags);
 

lib/lvol/lvol.c

@@ -32,7 +32,7 @@
  */
 
 #include "spdk_internal/lvolstore.h"
-#include "spdk_internal/log.h"
+#include "spdk/log.h"
 #include "spdk/string.h"
 #include "spdk/thread.h"
 #include "spdk/blob_bdev.h"

lib/nbd/nbd.c

@@ -45,7 +45,6 @@
 #include "spdk/util.h"
 #include "spdk/thread.h"
 
-#include "spdk_internal/log.h"
 #include "spdk/queue.h"
 
 #define GET_IO_LOOP_COUNT		16

lib/nbd/nbd_rpc.c

@@ -39,7 +39,7 @@
 #include <linux/nbd.h>
 
 #include "nbd_internal.h"
-#include "spdk_internal/log.h"
+#include "spdk/log.h"
 
 struct rpc_nbd_start_disk {
 	char *bdev_name;

lib/net/net_rpc.c

@@ -39,7 +39,7 @@
 #include "spdk/net.h"
 #include "spdk/util.h"
 
-#include "spdk_internal/log.h"
+#include "spdk/log.h"
 
 struct rpc_ip_address {
 	int32_t ifc_index;

lib/notify/notify_rpc.c

@@ -38,7 +38,7 @@
 #include "spdk/env.h"
 #include "spdk/util.h"
 
-#include "spdk_internal/log.h"
+#include "spdk/log.h"
 
 static int
 notify_get_types_cb(const struct spdk_notify_type *type, void *ctx)

lib/nvme/nvme_internal.h

@@ -56,7 +56,7 @@
 #include "spdk/uuid.h"
 
 #include "spdk_internal/assert.h"
-#include "spdk_internal/log.h"
+#include "spdk/log.h"
 
 extern pid_t g_spdk_nvme_pid;
 

lib/nvme/nvme_opal.c

@@ -31,7 +31,7 @@
  *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "spdk/opal.h"
-#include "spdk_internal/log.h"
+#include "spdk/log.h"
 #include "spdk/util.h"
 
 #include "nvme_opal_internal.h"

lib/nvmf/ctrlr.c

@@ -46,7 +46,7 @@
 #include "spdk/util.h"
 #include "spdk/version.h"
 
-#include "spdk_internal/log.h"
+#include "spdk/log.h"
 
 #define MIN_KEEP_ALIVE_TIMEOUT_IN_MS 10000
 #define NVMF_DISC_KATO_IN_MS 120000

lib/nvmf/ctrlr_bdev.c

@@ -47,7 +47,7 @@
 #include "spdk/string.h"
 #include "spdk/util.h"
 
-#include "spdk_internal/log.h"
+#include "spdk/log.h"
 
 static bool
 nvmf_subsystem_bdev_io_type_supported(struct spdk_nvmf_subsystem *subsystem,

lib/nvmf/ctrlr_discovery.c

@@ -45,7 +45,7 @@
 #include "spdk/nvmf_spec.h"
 
 #include "spdk/bdev_module.h"
-#include "spdk_internal/log.h"
+#include "spdk/log.h"
 
 static struct spdk_nvmf_discovery_log_page *
 nvmf_generate_discovery_log(struct spdk_nvmf_tgt *tgt, const char *hostnqn, size_t *log_page_size)

lib/nvmf/fc.c

@@ -46,8 +46,6 @@
 #include "spdk/log.h"
 #include "spdk/thread.h"
 
-#include "spdk_internal/log.h"
-
 #include "nvmf_fc.h"
 #include "fc_lld.h"
 

lib/nvmf/fc_ls.c

@@ -39,7 +39,7 @@
 #include "spdk/trace.h"
 #include "spdk/util.h"
 #include "spdk/endian.h"
-#include "spdk_internal/log.h"
+#include "spdk/log.h"
 #include "nvmf_internal.h"
 #include "transport.h"
 

lib/nvmf/nvmf.c

@@ -42,7 +42,7 @@
 #include "spdk/endian.h"
 #include "spdk/string.h"
 
-#include "spdk_internal/log.h"
+#include "spdk/log.h"
 
 #include "nvmf_internal.h"
 #include "transport.h"

lib/nvmf/nvmf_rpc.c

@@ -41,7 +41,6 @@
 #include "spdk/util.h"
 #include "spdk/bit_array.h"
 
-#include "spdk_internal/log.h"
 #include "spdk_internal/assert.h"
 
 #include "nvmf_internal.h"

lib/nvmf/rdma.c

@@ -42,7 +42,7 @@
 #include "spdk/util.h"
 
 #include "spdk_internal/assert.h"
-#include "spdk_internal/log.h"
+#include "spdk/log.h"
 #include "spdk_internal/rdma.h"
 
 #include "nvmf_internal.h"

lib/nvmf/subsystem.c

@@ -45,7 +45,7 @@
 #include "spdk/file.h"
 
 #include "spdk/bdev_module.h"
-#include "spdk_internal/log.h"
+#include "spdk/log.h"
 #include "spdk_internal/utf.h"
 
 #define MODEL_NUMBER_DEFAULT "SPDK bdev Controller"

lib/nvmf/tcp.c

@@ -43,7 +43,7 @@
 #include "spdk/util.h"
 
 #include "spdk_internal/assert.h"
-#include "spdk_internal/log.h"
+#include "spdk/log.h"
 #include "spdk_internal/nvme_tcp.h"
 
 #include "nvmf_internal.h"

lib/rdma/rdma_mlx5_dv.c

@@ -39,7 +39,7 @@
 #include "spdk/likely.h"
 
 #include "spdk_internal/rdma.h"
-#include "spdk_internal/log.h"
+#include "spdk/log.h"
 
 struct spdk_rdma_mlx5_dv_qp {
 	struct spdk_rdma_qp common;

lib/rdma/rdma_verbs.c

@@ -38,7 +38,7 @@
 #include "spdk/likely.h"
 
 #include "spdk_internal/rdma.h"
-#include "spdk_internal/log.h"
+#include "spdk/log.h"
 
 struct spdk_rdma_qp *
 spdk_rdma_qp_create(struct rdma_cm_id *cm_id, struct spdk_rdma_qp_init_attr *qp_attr)

lib/reduce/reduce.c

@@ -38,7 +38,7 @@
 #include "spdk/string.h"
 #include "spdk/bit_array.h"
 #include "spdk/util.h"
-#include "spdk_internal/log.h"
+#include "spdk/log.h"
 
 #include "libpmem.h"
 

lib/scsi/scsi_internal.h

@@ -43,7 +43,7 @@
 #include "spdk/trace.h"
 #include "spdk/dif.h"
 
-#include "spdk_internal/log.h"
+#include "spdk/log.h"
 
 enum {
 	SPDK_SCSI_TASK_UNKNOWN = -1,

lib/sock/sock.c

@@ -35,7 +35,7 @@
 
 #include "spdk/sock.h"
 #include "spdk_internal/sock.h"
-#include "spdk_internal/log.h"
+#include "spdk/log.h"
 
 #define SPDK_SOCK_DEFAULT_PRIORITY 0
 #define SPDK_SOCK_DEFAULT_ZCOPY true

lib/sock/sock_rpc.c

@@ -36,7 +36,7 @@
 #include "spdk/util.h"
 #include "spdk/string.h"
 
-#include "spdk_internal/log.h"
+#include "spdk/log.h"
 
 
 static const struct spdk_json_object_decoder rpc_sock_impl_get_opts_decoders[] = {

lib/thread/thread.c

@@ -40,7 +40,7 @@
 #include "spdk/thread.h"
 #include "spdk/util.h"
 
-#include "spdk_internal/log.h"
+#include "spdk/log.h"
 #include "spdk_internal/thread.h"
 
 #define SPDK_MSG_BATCH_SIZE		8

lib/trace/trace_flags.c

@@ -36,7 +36,6 @@
 #include "spdk/env.h"
 #include "spdk/trace.h"
 #include "spdk/log.h"
-#include "spdk_internal/log.h"
 
 struct spdk_trace_flags *g_trace_flags = NULL;
 static struct spdk_trace_register_fn *g_reg_fn_head = NULL;

lib/trace/trace_rpc.c

@@ -34,7 +34,7 @@
 #include "spdk/rpc.h"
 #include "spdk/util.h"
 #include "spdk/trace.h"
-#include "spdk_internal/log.h"
+#include "spdk/log.h"
 
 struct rpc_tpoint_group {
 	char *name;

lib/vhost/vhost_internal.h

@@ -40,7 +40,7 @@
 #include <rte_vhost.h>
 
 #include "spdk_internal/vhost_user.h"
-#include "spdk_internal/log.h"
+#include "spdk/log.h"
 #include "spdk/util.h"
 #include "spdk/rpc.h"
 #include "spdk/config.h"

lib/vhost/vhost_rpc.c

@@ -33,7 +33,7 @@
 
 #include "spdk/stdinc.h"
 
-#include "spdk_internal/log.h"
+#include "spdk/log.h"
 #include "spdk/rpc.h"
 #include "spdk/util.h"
 #include "spdk/string.h"

lib/virtio/vhost_user.h

@@ -36,7 +36,7 @@
 
 #include "spdk/stdinc.h"
 
-#include "spdk_internal/log.h"
+#include "spdk/log.h"
 #include "spdk_internal/virtio.h"
 #include "spdk_internal/vhost_user.h"
 

lib/vmd/vmd.h

@@ -38,7 +38,7 @@
 #include "spdk/vmd.h"
 #include "spdk/env.h"
 #include "spdk/util.h"
-#include "spdk_internal/log.h"
+#include "spdk/log.h"
 #include "vmd_spec.h"
 
 struct vmd_hot_plug;

module/accel/idxd/accel_engine_idxd.c

@@ -36,7 +36,7 @@
 #include "spdk/stdinc.h"
 
 #include "spdk_internal/accel_engine.h"
-#include "spdk_internal/log.h"
+#include "spdk/log.h"
 #include "spdk_internal/idxd.h"
 
 #include "spdk/env.h"

module/accel/ioat/accel_engine_ioat.c

@@ -36,7 +36,7 @@
 #include "spdk/stdinc.h"
 
 #include "spdk_internal/accel_engine.h"
-#include "spdk_internal/log.h"
+#include "spdk/log.h"
 
 #include "spdk/env.h"
 #include "spdk/conf.h"

module/bdev/aio/bdev_aio.c

@@ -47,7 +47,7 @@
 #include "spdk/util.h"
 #include "spdk/string.h"
 
-#include "spdk_internal/log.h"
+#include "spdk/log.h"
 
 #include <libaio.h>
 

module/bdev/aio/bdev_aio_rpc.c

@@ -35,7 +35,7 @@
 #include "spdk/rpc.h"
 #include "spdk/util.h"
 #include "spdk/string.h"
-#include "spdk_internal/log.h"
+#include "spdk/log.h"
 
 struct rpc_construct_aio {
 	char *name;

module/bdev/compress/vbdev_compress.c

@@ -44,7 +44,7 @@
 #include "spdk/util.h"
 #include "spdk/bdev_module.h"
 
-#include "spdk_internal/log.h"
+#include "spdk/log.h"
 
 #include <rte_config.h>
 #include <rte_bus_vdev.h>

module/bdev/compress/vbdev_compress_rpc.c

@@ -35,7 +35,7 @@
 #include "spdk/rpc.h"
 #include "spdk/util.h"
 #include "spdk/string.h"
-#include "spdk_internal/log.h"
+#include "spdk/log.h"
 
 struct rpc_bdev_compress_get_orphans {
 	char *name;

module/bdev/crypto/vbdev_crypto.c

@@ -38,7 +38,7 @@
 #include "spdk/endian.h"
 #include "spdk/thread.h"
 #include "spdk/bdev_module.h"
-#include "spdk_internal/log.h"
+#include "spdk/log.h"
 
 #include <rte_config.h>
 #include <rte_version.h>

module/bdev/crypto/vbdev_crypto.h

@@ -37,7 +37,7 @@
 #include "spdk/rpc.h"
 #include "spdk/util.h"
 #include "spdk/string.h"
-#include "spdk_internal/log.h"
+#include "spdk/log.h"
 
 #include "spdk/bdev.h"
 

module/bdev/delay/vbdev_delay.c

@@ -43,7 +43,7 @@
 #include "spdk/util.h"
 
 #include "spdk/bdev_module.h"
-#include "spdk_internal/log.h"
+#include "spdk/log.h"
 
 
 static int vbdev_delay_init(void);

module/bdev/delay/vbdev_delay_rpc.c

@@ -36,7 +36,7 @@
 #include "spdk/rpc.h"
 #include "spdk/util.h"
 #include "spdk/string.h"
-#include "spdk_internal/log.h"
+#include "spdk/log.h"
 #include "spdk_internal/assert.h"
 
 struct rpc_update_latency {

module/bdev/error/vbdev_error.c

@@ -44,7 +44,7 @@
 #include "spdk/string.h"
 
 #include "spdk/bdev_module.h"
-#include "spdk_internal/log.h"
+#include "spdk/log.h"
 
 #include "vbdev_error.h"
 

module/bdev/error/vbdev_error_rpc.c

@@ -36,7 +36,7 @@
 #include "spdk/rpc.h"
 #include "spdk/util.h"
 #include "spdk/string.h"
-#include "spdk_internal/log.h"
+#include "spdk/log.h"
 #include "vbdev_error.h"
 
 #define ERROR_BDEV_IO_TYPE_INVALID (SPDK_BDEV_IO_TYPE_RESET + 1)

module/bdev/ftl/bdev_ftl.c

@@ -42,7 +42,7 @@
 #include "spdk/util.h"
 #include "spdk/string.h"
 #include "spdk/ftl.h"
-#include "spdk_internal/log.h"
+#include "spdk/log.h"
 
 #include "bdev_ftl.h"
 

module/bdev/ftl/bdev_ftl_rpc.c

@@ -35,7 +35,7 @@
 #include "spdk/util.h"
 #include "spdk/bdev_module.h"
 #include "spdk/string.h"
-#include "spdk_internal/log.h"
+#include "spdk/log.h"
 
 #include "bdev_ftl.h"
 

module/bdev/gpt/gpt.c

@@ -37,7 +37,7 @@
 #include "spdk/endian.h"
 #include "spdk/event.h"
 
-#include "spdk_internal/log.h"
+#include "spdk/log.h"
 
 #define GPT_PRIMARY_PARTITION_TABLE_LBA 0x1
 #define PRIMARY_PARTITION_NUMBER 4

module/bdev/gpt/vbdev_gpt.c

@@ -47,7 +47,7 @@
 #include "spdk/util.h"
 
 #include "spdk/bdev_module.h"
-#include "spdk_internal/log.h"
+#include "spdk/log.h"
 
 static int vbdev_gpt_init(void);
 static void vbdev_gpt_examine(struct spdk_bdev *bdev);

module/bdev/iscsi/bdev_iscsi.c

@@ -44,7 +44,7 @@
 #include "spdk/string.h"
 #include "spdk/iscsi_spec.h"
 
-#include "spdk_internal/log.h"
+#include "spdk/log.h"
 #include "spdk/bdev_module.h"
 
 #include "iscsi/iscsi.h"

module/bdev/iscsi/bdev_iscsi_rpc.c

@@ -36,7 +36,7 @@
 #include "spdk/util.h"
 #include "spdk/string.h"
 
-#include "spdk_internal/log.h"
+#include "spdk/log.h"
 
 struct rpc_bdev_iscsi_create {
 	char *name;

module/bdev/lvol/vbdev_lvol.c

@@ -34,7 +34,7 @@
 #include "spdk/blob_bdev.h"
 #include "spdk/rpc.h"
 #include "spdk/bdev_module.h"
-#include "spdk_internal/log.h"
+#include "spdk/log.h"
 #include "spdk/string.h"
 #include "spdk/uuid.h"
 

module/bdev/lvol/vbdev_lvol_rpc.c

@@ -36,7 +36,7 @@
 #include "spdk/util.h"
 #include "vbdev_lvol.h"
 #include "spdk/string.h"
-#include "spdk_internal/log.h"
+#include "spdk/log.h"
 
 SPDK_LOG_REGISTER_COMPONENT(lvol_rpc)
 

module/bdev/malloc/bdev_malloc.c

@@ -45,7 +45,7 @@
 #include "spdk/string.h"
 
 #include "spdk/bdev_module.h"
-#include "spdk_internal/log.h"
+#include "spdk/log.h"
 
 struct malloc_disk {
 	struct spdk_bdev		disk;

module/bdev/malloc/bdev_malloc_rpc.c

@@ -36,7 +36,7 @@
 #include "spdk/util.h"
 #include "spdk/uuid.h"
 #include "spdk/string.h"
-#include "spdk_internal/log.h"
+#include "spdk/log.h"
 
 struct rpc_construct_malloc {
 	char *name;

module/bdev/null/bdev_null.c

@@ -42,7 +42,7 @@
 #include "spdk/likely.h"
 
 #include "spdk/bdev_module.h"
-#include "spdk_internal/log.h"
+#include "spdk/log.h"
 
 #include "bdev_null.h"
 

module/bdev/null/bdev_null_rpc.c

@@ -35,7 +35,7 @@
 #include "spdk/util.h"
 #include "spdk/string.h"
 #include "spdk/bdev_module.h"
-#include "spdk_internal/log.h"
+#include "spdk/log.h"
 
 #include "bdev_null.h"
 

module/bdev/nvme/bdev_nvme.c

@@ -49,7 +49,7 @@
 #include "spdk/util.h"
 
 #include "spdk/bdev_module.h"
-#include "spdk_internal/log.h"
+#include "spdk/log.h"
 
 #define SPDK_BDEV_NVME_DEFAULT_DELAY_CMD_SUBMIT true
 

module/bdev/nvme/bdev_nvme_cuse_rpc.c

@@ -40,7 +40,7 @@
 #include "spdk/util.h"
 #include "spdk/nvme.h"
 
-#include "spdk_internal/log.h"
+#include "spdk/log.h"
 
 struct rpc_nvme_cuse_register {
 	char *name;

module/bdev/nvme/bdev_nvme_rpc.c

@@ -42,7 +42,7 @@
 #include "spdk/rpc.h"
 #include "spdk/util.h"
 
-#include "spdk_internal/log.h"
+#include "spdk/log.h"
 #include "spdk/bdev_module.h"
 
 struct open_descriptors {

module/bdev/nvme/bdev_ocssd.c

@@ -40,7 +40,6 @@
 #include "spdk/util.h"
 #include "spdk/nvme_ocssd.h"
 #include "spdk/nvme_ocssd_spec.h"
-#include "spdk_internal/log.h"
 #include "spdk/nvme.h"
 #include "common.h"
 #include "bdev_ocssd.h"

module/bdev/nvme/nvme_rpc.c

@@ -36,7 +36,7 @@
 #include "spdk/rpc.h"
 #include "spdk/util.h"
 #include "spdk/bdev_module.h"
-#include "spdk_internal/log.h"
+#include "spdk/log.h"
 
 #include "bdev_nvme.h"
 #include "common.h"

module/bdev/nvme/vbdev_opal.c

@@ -34,7 +34,7 @@
 #include "spdk/opal.h"
 #include "spdk/bdev_module.h"
 #include "vbdev_opal.h"
-#include "spdk_internal/log.h"
+#include "spdk/log.h"
 #include "spdk/string.h"
 
 /* OPAL locking range only supports operations on nsid=1 for now */

module/bdev/nvme/vbdev_opal_rpc.c

@@ -34,7 +34,7 @@
 #include "spdk/rpc.h"
 #include "spdk/util.h"
 #include "spdk/string.h"
-#include "spdk_internal/log.h"
+#include "spdk/log.h"
 
 #include "vbdev_opal.h"
 

module/bdev/ocf/ctx.c

@@ -34,7 +34,7 @@
 #include <execinfo.h>
 
 #include "spdk/env.h"
-#include "spdk_internal/log.h"
+#include "spdk/log.h"
 
 #include "ctx.h"
 #include "ocf_env.h"

module/bdev/ocf/vbdev_ocf.c

@@ -45,7 +45,7 @@
 #include "spdk/conf.h"
 #include "spdk/thread.h"
 #include "spdk/string.h"
-#include "spdk_internal/log.h"
+#include "spdk/log.h"
 #include "spdk/cpuset.h"
 
 static struct spdk_bdev_module ocf_if;

module/bdev/ocf/volume.c

@@ -36,7 +36,7 @@
 #include "spdk/bdev_module.h"
 #include "spdk/env.h"
 #include "spdk/thread.h"
-#include "spdk_internal/log.h"
+#include "spdk/log.h"
 
 #include "data.h"
 #include "volume.h"

module/bdev/passthru/vbdev_passthru.c

@@ -48,7 +48,7 @@
 #include "spdk/util.h"
 
 #include "spdk/bdev_module.h"
-#include "spdk_internal/log.h"
+#include "spdk/log.h"
 
 
 static int vbdev_passthru_init(void);

module/bdev/passthru/vbdev_passthru_rpc.c

@@ -35,7 +35,7 @@
 #include "spdk/rpc.h"
 #include "spdk/util.h"
 #include "spdk/string.h"
-#include "spdk_internal/log.h"
+#include "spdk/log.h"
 
 /* Structure to hold the parameters for this RPC method. */
 struct rpc_bdev_passthru_create {

module/bdev/pmem/bdev_pmem.c

@@ -37,7 +37,7 @@
 #include "spdk/util.h"
 #include "spdk/rpc.h"
 #include "spdk/bdev_module.h"
-#include "spdk_internal/log.h"
+#include "spdk/log.h"
 #include "spdk/config.h"
 
 #include "bdev_pmem.h"