diff options
| author | bde <bde@FreeBSD.org> | 1997-01-29 14:18:34 +0000 |
|---|---|---|
| committer | bde <bde@FreeBSD.org> | 1997-01-29 14:18:34 +0000 |
| commit | 477f38f71b773445b0487e58d8e73115ca9d65a1 (patch) | |
| tree | 41ba5bffaed5094a40f17c6c0d36aff50dbfa725 /sys | |
| parent | a40655e5dd90ad1dc18034c6026793f1f8aa2ae9 (diff) | |
| download | FreeBSD-src-477f38f71b773445b0487e58d8e73115ca9d65a1.zip FreeBSD-src-477f38f71b773445b0487e58d8e73115ca9d65a1.tar.gz | |
Removed `Debugger("no slices")'. It's normal and harmless to have no
slices in sd_open() after a media change when the previous sd_open()
discards the previous slices and then fails. sd_open() just handles
media changes poorly and fails too often.
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/scsi/sd.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/sys/scsi/sd.c b/sys/scsi/sd.c index c38bef7..c47e71b 100644 --- a/sys/scsi/sd.c +++ b/sys/scsi/sd.c @@ -281,7 +281,7 @@ sd_open(dev, mode, fmt, p, sc_link) * If it's been invalidated, then forget the label */ sc_link->flags |= SDEV_OPEN; /* unit attn becomes an err now */ - if (!(sc_link->flags & SDEV_MEDIA_LOADED)) { + if (!(sc_link->flags & SDEV_MEDIA_LOADED) && sd->dk_slices != NULL) { /* * If somebody still has it open, then forbid re-entry. */ @@ -290,10 +290,7 @@ sd_open(dev, mode, fmt, p, sc_link) goto bad; } - if (sd->dk_slices == NULL) - Debugger("sdopen: no slices"); - else - dsgone(&sd->dk_slices); + dsgone(&sd->dk_slices); } /* * In case it is a funny one, tell it to start |
