summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkrw <krw@openbsd.org>2020-02-05 21:50:41 +0000
committerkrw <krw@openbsd.org>2020-02-05 21:50:41 +0000
commitca82ddf5a80ee935c2112c968477cf859a0171e8 (patch)
tree064b347d574d39b041e1ed8d219516a81d886d0d
parentReset the key share so that we do not have an existing peer public key. (diff)
downloadwireguard-openbsd-ca82ddf5a80ee935c2112c968477cf859a0171e8.tar.xz
wireguard-openbsd-ca82ddf5a80ee935c2112c968477cf859a0171e8.zip
Ooops. Missed a file in nuke of scsi_minphys. mpath_minphys() needs to
check dev_minphys for NULL before calling it.
-rw-r--r--sys/scsi/mpath.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/sys/scsi/mpath.c b/sys/scsi/mpath.c
index ee64295d2be..b6d82649c1c 100644
--- a/sys/scsi/mpath.c
+++ b/sys/scsi/mpath.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mpath.c,v 1.46 2020/02/05 16:29:30 krw Exp $ */
+/* $OpenBSD: mpath.c,v 1.47 2020/02/05 21:50:41 krw Exp $ */
/*
* Copyright (c) 2009 David Gwynne <dlg@openbsd.org>
@@ -409,7 +409,8 @@ mpath_minphys(struct buf *bp, struct scsi_link *link)
TAILQ_FOREACH(g, &d->d_groups, g_entry) {
TAILQ_FOREACH(p, &g->g_paths, p_entry) {
/* XXX crossing layers with mutex held */
- p->p_link->adapter->dev_minphys(bp, p->p_link);
+ if (p->p_link->adapter->dev_minphys != NULL)
+ p->p_link->adapter->dev_minphys(bp, p->p_link);
}
}
mtx_leave(&d->d_mtx);