From f3e0bfd7efe23a95bd1c87b0dd6b965902d18fad Mon Sep 17 00:00:00 2001
From: Daniel Verkamp <daniel.verkamp@intel.com>
Date: Thu, 30 Nov 2017 13:45:30 -0700
Subject: [PATCH] bdev: remove get_ctx_size functions that return 0

The bdev module get_ctx_size callback is only necessary if it returns a
non-zero size.

Change-Id: I00ca366b8a1949bdb091c5e8aefb19cb606481d0
Signed-off-by: Daniel Verkamp <daniel.verkamp@intel.com>
Reviewed-on: https://review.gerrithub.io/389900
Tested-by: SPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
---
 lib/bdev/gpt/vbdev_gpt.c     | 8 +-------
 lib/bdev/null/bdev_null.c    | 8 +-------
 lib/bdev/pmem/bdev_pmem.c    | 8 +-------
 lib/bdev/rbd/bdev_rbd.c      | 8 +-------
 lib/bdev/split/vbdev_split.c | 8 +-------
 5 files changed, 5 insertions(+), 35 deletions(-)

diff --git a/lib/bdev/gpt/vbdev_gpt.c b/lib/bdev/gpt/vbdev_gpt.c
index e8dfbffa5..e2192345e 100644
--- a/lib/bdev/gpt/vbdev_gpt.c
+++ b/lib/bdev/gpt/vbdev_gpt.c
@@ -381,12 +381,6 @@ vbdev_gpt_examine(struct spdk_bdev *bdev)
 	}
 }
 
-static int
-vbdev_gpt_get_ctx_size(void)
-{
-	return 0;
-}
-
 SPDK_BDEV_MODULE_REGISTER(gpt, vbdev_gpt_init, vbdev_gpt_fini, NULL,
-			  vbdev_gpt_get_ctx_size, vbdev_gpt_examine)
+			  NULL, vbdev_gpt_examine)
 SPDK_LOG_REGISTER_TRACE_FLAG("vbdev_gpt", SPDK_TRACE_VBDEV_GPT)
diff --git a/lib/bdev/null/bdev_null.c b/lib/bdev/null/bdev_null.c
index a9d45f3ad..c66c86c5f 100644
--- a/lib/bdev/null/bdev_null.c
+++ b/lib/bdev/null/bdev_null.c
@@ -53,12 +53,6 @@ struct null_bdev {
 static TAILQ_HEAD(, null_bdev) g_null_bdev_head;
 static void *g_null_read_buf;
 
-static int
-bdev_null_get_ctx_size(void)
-{
-	return 0;
-}
-
 static int
 bdev_null_destruct(void *ctx)
 {
@@ -295,6 +289,6 @@ bdev_null_get_spdk_running_config(FILE *fp)
 }
 
 SPDK_BDEV_MODULE_REGISTER(null, bdev_null_initialize, bdev_null_finish,
-			  bdev_null_get_spdk_running_config, bdev_null_get_ctx_size, NULL)
+			  bdev_null_get_spdk_running_config, NULL, NULL)
 
 SPDK_LOG_REGISTER_TRACE_FLAG("bdev_null", SPDK_TRACE_BDEV_NULL)
diff --git a/lib/bdev/pmem/bdev_pmem.c b/lib/bdev/pmem/bdev_pmem.c
index 2ceb7ee79..3a09ca2fc 100644
--- a/lib/bdev/pmem/bdev_pmem.c
+++ b/lib/bdev/pmem/bdev_pmem.c
@@ -56,14 +56,8 @@ static int pmem_disk_count = 0;
 static int bdev_pmem_initialize(void);
 static void bdev_pmem_finish(void);
 
-static int
-bdev_pmem_get_ctx_size(void)
-{
-	return 0;
-}
-
 SPDK_BDEV_MODULE_REGISTER(pmem, bdev_pmem_initialize, bdev_pmem_finish,
-			  NULL, bdev_pmem_get_ctx_size, NULL)
+			  NULL, NULL, NULL)
 SPDK_BDEV_MODULE_ASYNC_FINI(pmem);
 
 
diff --git a/lib/bdev/rbd/bdev_rbd.c b/lib/bdev/rbd/bdev_rbd.c
index 6bc4f1143..502d044ab 100644
--- a/lib/bdev/rbd/bdev_rbd.c
+++ b/lib/bdev/rbd/bdev_rbd.c
@@ -201,14 +201,8 @@ bdev_rbd_start_aio(rbd_image_t image, struct spdk_bdev_io *bdev_io,
 static int bdev_rbd_library_init(void);
 static void bdev_rbd_library_fini(void);
 
-static int
-bdev_rbd_get_ctx_size(void)
-{
-	return 0;
-}
-
 SPDK_BDEV_MODULE_REGISTER(rbd, bdev_rbd_library_init, bdev_rbd_library_fini, NULL,
-			  bdev_rbd_get_ctx_size, NULL)
+			  NULL, NULL)
 
 static int64_t
 bdev_rbd_rw(struct bdev_rbd *disk, struct spdk_io_channel *ch,
diff --git a/lib/bdev/split/vbdev_split.c b/lib/bdev/split/vbdev_split.c
index dc366c8fd..24af5af33 100644
--- a/lib/bdev/split/vbdev_split.c
+++ b/lib/bdev/split/vbdev_split.c
@@ -270,12 +270,6 @@ vbdev_split_fini(void)
 	spdk_bdev_part_tailq_fini(&g_split_disks);
 }
 
-static int
-vbdev_split_get_ctx_size(void)
-{
-	return 0;
-}
-
 SPDK_BDEV_MODULE_REGISTER(split, vbdev_split_init, vbdev_split_fini, NULL,
-			  vbdev_split_get_ctx_size, vbdev_split_examine)
+			  NULL, vbdev_split_examine)
 SPDK_LOG_REGISTER_TRACE_FLAG("vbdev_split", SPDK_TRACE_VBDEV_SPLIT)