diff options
| author | Kenneth R Westerback <krw@cvs.openbsd.org> | 2010-03-23 01:57:21 +0000 |
|---|---|---|
| committer | Kenneth R Westerback <krw@cvs.openbsd.org> | 2010-03-23 01:57:21 +0000 |
| commit | cd948c1fd3a45bb8ee18483b4f8df6ce849f8140 (patch) | |
| tree | 2748525ad92550d0ad2b46b5619c24e5bcda0e13 /sys/scsi/mpath.c | |
| parent | e88d321d148e115dbbf6fea61f7c0dcb67021421 (diff) | |
Change the scsi_cmd function member of scsi_adapter from int to
void. Use XS_NO_CCB error in the scsi command (xs) to report the
NO_CCB condition. Eliminates all SUCCESSFULLY_QUEUED and COMPLETE
confusion and untangles the midlayer from the adapter a bit more.
Eyes and some fixes by miod@
There may be some compile issues on little used (i.e. I don't have
any) drivers but the change is mechanical and thus easy to remedy.
ok dlg@
Diffstat (limited to 'sys/scsi/mpath.c')
| -rw-r--r-- | sys/scsi/mpath.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/sys/scsi/mpath.c b/sys/scsi/mpath.c index 25b796760dd..98c058cbf8b 100644 --- a/sys/scsi/mpath.c +++ b/sys/scsi/mpath.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mpath.c,v 1.12 2010/01/03 01:36:40 dlg Exp $ */ +/* $OpenBSD: mpath.c,v 1.13 2010/03/23 01:57:20 krw Exp $ */ /* * Copyright (c) 2009 David Gwynne <dlg@openbsd.org> @@ -74,7 +74,7 @@ struct cfdriver mpath_cd = { DV_DULL }; -int mpath_cmd(struct scsi_xfer *); +void mpath_cmd(struct scsi_xfer *); void mpath_minphys(struct buf *, struct scsi_link *); int mpath_probe(struct scsi_link *); @@ -147,7 +147,7 @@ mpath_probe(struct scsi_link *link) return (0); } -int +void mpath_cmd(struct scsi_xfer *xs) { struct scsi_link *link = xs->sc_link; @@ -157,13 +157,13 @@ mpath_cmd(struct scsi_xfer *xs) if (n == NULL || p == NULL) { mpath_xs_stuffup(xs); - return (COMPLETE); + return; } mxs = scsi_xs_get(p->path_link, xs->flags); if (mxs == NULL) { mpath_xs_stuffup(xs); - return (COMPLETE); + return; } memcpy(mxs->cmd, xs->cmd, xs->cmdlen); @@ -178,8 +178,6 @@ mpath_cmd(struct scsi_xfer *xs) mxs->done = mpath_done; scsi_xs_exec(mxs); - - return (COMPLETE); /* doesnt matter anymore */ } void |