Module Name: src
Committed By: martin
Date: Mon Dec 7 20:05:36 UTC 2020
Modified Files:
src/sys/dev/ic [netbsd-8]: nvme.c
Log Message:
Pull up following revision(s) (requested by kardel in ticket #1633):
sys/dev/ic/nvme.c: revision 1.53
PR kern/55839:
handle multiple nvme_rescan()s correctly by doing the
name-space identify only once per nsid.
fixes issue where modloading triggers multiple
rescans.
To generate a diff of this commit:
cvs rdiff -u -r1.30.2.8 -r1.30.2.9 src/sys/dev/ic/nvme.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/ic/nvme.c
diff -u src/sys/dev/ic/nvme.c:1.30.2.8 src/sys/dev/ic/nvme.c:1.30.2.9
--- src/sys/dev/ic/nvme.c:1.30.2.8 Sun Sep 27 10:33:45 2020
+++ src/sys/dev/ic/nvme.c Mon Dec 7 20:05:36 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: nvme.c,v 1.30.2.8 2020/09/27 10:33:45 martin Exp $ */
+/* $NetBSD: nvme.c,v 1.30.2.9 2020/12/07 20:05:36 martin Exp $ */
/* $OpenBSD: nvme.c,v 1.49 2016/04/18 05:59:50 dlg Exp $ */
/*
@@ -18,7 +18,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nvme.c,v 1.30.2.8 2020/09/27 10:33:45 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nvme.c,v 1.30.2.9 2020/12/07 20:05:36 martin Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -625,6 +625,12 @@ nvme_ns_identify(struct nvme_softc *sc,
KASSERT(nsid > 0);
+ ns = nvme_ns_get(sc, nsid);
+ KASSERT(ns);
+
+ if (ns->ident != NULL)
+ return 0;
+
ccb = nvme_ccb_get(sc->sc_admin_q, false);
KASSERT(ccb != NULL); /* it's a bug if we don't have spare ccb here */
@@ -662,9 +668,6 @@ nvme_ns_identify(struct nvme_softc *sc,
/* Convert data to host endian */
nvme_identify_namespace_swapbytes(identify);
- ns = nvme_ns_get(sc, nsid);
- KASSERT(ns);
- KASSERT(ns->ident == NULL);
ns->ident = identify;
done:
