d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove dup biodone and no more SCSIUSER option.

Browse Source
This commit is contained in:
Peter Dufault 1995-01-19 12:41:36 +00:00
parent 8d38e0afd0
commit c3280a6d1a
2 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/scsi/scsi_base.c
View File

@ -8,7 +8,7 @@
* file.
*
* Written by Julian Elischer (julian@dialix.oz.au)
* $Id: scsi_base.c,v 1.15 1994/11/15 14:49:56 bde Exp $
* $Id: scsi_base.c,v 1.16 1995/01/08 13:38:31 dufault Exp $
*/
#define SPLSD splbio
@ -330,8 +330,6 @@ scsi_done(xs)
* xs when the user returns. (and restarting the device's queue).
*/
if (xs->flags & SCSI_USER) {
biodone(xs->bp);
SC_DEBUG(sc_link, SDEV_DB3, ("calling user done()\n"));
scsi_user_done(xs); /* to take a copy of the sense etc. */
SC_DEBUG(sc_link, SDEV_DB3, ("returned from user done()\n "));

8
sys/scsi/scsi_ioctl.c
View File

@ -38,11 +38,9 @@
* SUCH DAMAGE.
*End copyright
*
* $Id: scsi_ioctl.c,v 1.8 1994/10/08 22:26:37 phk Exp $
* $Id: scsi_ioctl.c,v 1.9 1995/01/08 13:38:32 dufault Exp $
*
*
* Note: The SCSIUSER option is required to support the user defined
* ioctl calls.
*/
#include <sys/param.h>
#include <sys/systm.h>
@ -132,7 +130,7 @@ struct scsi_xfer *xs;
screq->retsts = SCCMD_UNKNOWN;
break;
}
biodone(bp); /* we're waiting on it in scsi_strategy() */
biodone(bp); /* we're waiting on it in scsistrategy() */
return; /* it'll free the xs and restart any queue */
}
@ -252,7 +250,6 @@ struct scsi_link *sc_link, int cmd, caddr_t addr, int f)
SC_DEBUG(sc_link,SDEV_DB2,("scsi_do_ioctl(0x%x)\n",cmd));
switch(cmd)
{
#ifdef SCSIUSER
case SCIOCCOMMAND:
{
/*
@ -322,7 +319,6 @@ struct scsi_link *sc_link, int cmd, caddr_t addr, int f)
}
break;
}
#endif /* SCSIUSER */
case SCIOCDEBUG:
{
int level = *((int *)addr);