From b63be39461bf705c235b78d4fa2813b16fff244b Mon Sep 17 00:00:00 2001
From: Konrad Sztyber <konrad.sztyber@intel.com>
Date: Mon, 9 Dec 2019 13:57:55 +0100
Subject: [PATCH] bdev/ocssd: move bdev_ocssd_get_zone_by_slba

Move bdev_ocssd_get_zone_by_slba up in the file.  This function is going
to be used by many others, so it makes sense to be defined near the top.

Change-Id: I7db438bac032966430b9ca6a56e977f7c7c3fe43
Signed-off-by: Konrad Sztyber <konrad.sztyber@intel.com>
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/477298
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Community-CI: Broadcom SPDK FC-NVMe CI <spdk-ci.pdl@broadcom.com>
Community-CI: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
---
 module/bdev/nvme/bdev_ocssd.c | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/module/bdev/nvme/bdev_ocssd.c b/module/bdev/nvme/bdev_ocssd.c
index 5db2c8920..544d50c74 100644
--- a/module/bdev/nvme/bdev_ocssd.c
+++ b/module/bdev/nvme/bdev_ocssd.c
@@ -150,6 +150,23 @@ static struct spdk_bdev_module ocssd_if = {
 
 SPDK_BDEV_MODULE_REGISTER(ocssd, &ocssd_if);
 
+static struct bdev_ocssd_zone *
+bdev_ocssd_get_zone_by_slba(struct ocssd_bdev *ocssd_bdev, uint64_t slba)
+{
+	struct nvme_bdev *nvme_bdev = &ocssd_bdev->nvme_bdev;
+	size_t zone_size = nvme_bdev->disk.zone_size;
+
+	if (slba % zone_size != 0) {
+		return NULL;
+	}
+
+	if (slba >= nvme_bdev->disk.blockcnt) {
+		return NULL;
+	}
+
+	return &ocssd_bdev->zones[slba / zone_size];
+}
+
 static void
 bdev_ocssd_free_bdev(struct ocssd_bdev *ocssd_bdev)
 {
@@ -614,23 +631,6 @@ bdev_ocssd_create_complete(struct bdev_ocssd_create_ctx *create_ctx, int status)
 	free(create_ctx);
 }
 
-static struct bdev_ocssd_zone *
-bdev_ocssd_get_zone_by_slba(struct ocssd_bdev *ocssd_bdev, uint64_t slba)
-{
-	struct nvme_bdev *nvme_bdev = &ocssd_bdev->nvme_bdev;
-	size_t zone_size = nvme_bdev->disk.zone_size;
-
-	if (slba % zone_size != 0) {
-		return NULL;
-	}
-
-	if (slba >= nvme_bdev->disk.blockcnt) {
-		return NULL;
-	}
-
-	return &ocssd_bdev->zones[slba / zone_size];
-}
-
 static int bdev_ocssd_init_zone(struct bdev_ocssd_create_ctx *create_ctx);
 
 static void