diff options
| author | wollman <wollman@FreeBSD.org> | 1998-02-01 18:09:50 +0000 |
|---|---|---|
| committer | wollman <wollman@FreeBSD.org> | 1998-02-01 18:09:50 +0000 |
| commit | 81f0e56cf6f29d0aab4c756546b75a094a98b770 (patch) | |
| tree | 69ae698d1a7def60e14907a994d72f735437ce9a /sys/scsi | |
| parent | bd8db5a10ec2c6dc8914e15cecc24ec8ed3290ae (diff) | |
| download | FreeBSD-src-81f0e56cf6f29d0aab4c756546b75a094a98b770.zip FreeBSD-src-81f0e56cf6f29d0aab4c756546b75a094a98b770.tar.gz | |
Serves me right for committing code late at night...
Fix the SCIOCGETDEVINFO code so that it compiles, and while I'm at it,
add support for human-readable device names so that I don't have
to call devname(3) on the scd->dev to get it.
Diffstat (limited to 'sys/scsi')
| -rw-r--r-- | sys/scsi/scsi_ioctl.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/sys/scsi/scsi_ioctl.c b/sys/scsi/scsi_ioctl.c index 8e340f7..7998282 100644 --- a/sys/scsi/scsi_ioctl.c +++ b/sys/scsi/scsi_ioctl.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. *End copyright * - * $Id: scsi_ioctl.c,v 1.27 1997/12/02 21:07:01 phk Exp $ + * $Id: scsi_ioctl.c,v 1.28 1998/02/01 04:13:00 wollman Exp $ * * */ @@ -256,7 +256,7 @@ struct proc *p, struct scsi_link *sc_link) /* If we can't write the device we can't permit much: */ - if (cmd != SCIOCIDENTIFY && cmd != SCSIOCGETDEVINFO&& !(flags & FWRITE)) + if (cmd != SCIOCIDENTIFY && cmd != SCIOCGETDEVINFO&& !(flags & FWRITE)) return EACCES; SC_DEBUG(sc_link,SDEV_DB2,("scsi_do_ioctl(0x%x)\n",cmd)); @@ -367,10 +367,16 @@ struct proc *p, struct scsi_link *sc_link) { struct scsi_devinfo *scd = (struct scsi_devinfo *)addr; struct scsi_link *scl; - scl = scsi_link_get(scd->addr.bus, scd->addr.target, + scl = scsi_link_get(scd->addr.scbus, scd->addr.target, scd->addr.lun); if (scl != 0) { scd->dev = scl->dev; + /* XXX buffers better be big enough... */ + sprintf(scd->devname, "%s%d", + scl->device->name, scl->dev_unit); + sprintf(scd->adname, "%s%d:%d", + scl->adapter->name, scl->adapter_unit, + scl->adapter_bus); ret = 0; } else { ret = ENXIO; |
