git: 8ed05c686fba - stable/12 - Rename ns notification function...

[Warner Losh]

The branch stable/12 has been updated by imp:

URL: https://cgit.FreeBSD.org/src/commit/?id=8ed05c686fba2300cc66a89418c14ab84e033c5f

commit 8ed05c686fba2300cc66a89418c14ab84e033c5f
Author:     Warner Losh <imp at FreeBSD.org>
AuthorDate: 2020-05-01 21:24:15 +0000
Commit:     Warner Losh <imp at FreeBSD.org>
CommitDate: 2021-07-31 00:02:51 +0000

    Rename ns notification function...
    
    This function is called whenever the namespace is added, deleted or
    changes. Update the name to reflect that. No functional change.
    
    (cherry picked from commit 950475ca2062b5d95efcf4d758cb5f33d7710aed)
---
 sys/dev/nvme/nvme_sim.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/sys/dev/nvme/nvme_sim.c b/sys/dev/nvme/nvme_sim.c
index b66126b11bce..c9d8d94543d7 100644
--- a/sys/dev/nvme/nvme_sim.c
+++ b/sys/dev/nvme/nvme_sim.c
@@ -315,7 +315,7 @@ err1:
 }
 
 static void *
-nvme_sim_new_ns(struct nvme_namespace *ns, void *sc_arg)
+nvme_sim_ns_change(struct nvme_namespace *ns, void *sc_arg)
 {
 	struct nvme_sim_softc *sc = sc_arg;
 	union ccb *ccb;
@@ -339,7 +339,7 @@ nvme_sim_new_ns(struct nvme_namespace *ns, void *sc_arg)
 	}
 	xpt_rescan(ccb);
 
-	return (ns);
+	return (sc_arg);
 }
 
 static void
@@ -362,7 +362,7 @@ nvme_sim_init(void)
 	if (nvme_use_nvd)
 		return;
 
-	consumer_cookie = nvme_register_consumer(nvme_sim_new_ns,
+	consumer_cookie = nvme_register_consumer(nvme_sim_ns_change,
 	    nvme_sim_new_controller, NULL, nvme_sim_controller_fail);
 }