diff options
| author | Kenneth R Westerback <krw@cvs.openbsd.org> | 2020-02-05 21:50:42 +0000 |
|---|---|---|
| committer | Kenneth R Westerback <krw@cvs.openbsd.org> | 2020-02-05 21:50:42 +0000 |
| commit | 44bb1ffc34bd1128641e426dcd30f19c7d0a4835 (patch) | |
| tree | 572404e0cdf8c3d65336be1628ea4a2c042cccaf /sys/scsi | |
| parent | abe0a6d63e0cb5ba5f11df01755f284578ac18c9 (diff) | |
Ooops. Missed a file in nuke of scsi_minphys. mpath_minphys() needs to
check dev_minphys for NULL before calling it.
Diffstat (limited to 'sys/scsi')
| -rw-r--r-- | sys/scsi/mpath.c | 5 |
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); |