Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Deal with variable-length drives that don't specify a maximum block size.

Browse Source 
c.f. SCSI 2 protocol definition.
This commit is contained in:
mycroft 1994-04-24 05:40:05 +00:00
parent c791f19ad1
commit efbbf1b09f
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sys/dev/scsipi/st.c
View File

@ -26,7 +26,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* *
* $Id: st.c,v 1.28 1994/04/13 05:43:21 mycroft Exp $ * $Id: st.c,v 1.29 1994/04/24 05:40:05 mycroft Exp $
*/ */
/* /*
@ -892,7 +892,8 @@ ststrategy(bp)
/* /*
* as are out-of-range requests on variable drives. * as are out-of-range requests on variable drives.
*/ */
else if (bp->b_bcount < st->blkmin || bp->b_bcount > st->blkmax) { else if (bp->b_bcount < st->blkmin ||
(st->blkmax && bp->b_bcount > st->blkmax)) {
printf("%s: bad request, must be between %d and %d\n", printf("%s: bad request, must be between %d and %d\n",
st->sc_dev.dv_xname, st->blkmin, st->blkmax); st->sc_dev.dv_xname, st->blkmin, st->blkmax);
bp->b_error = EIO; bp->b_error = EIO;

5
sys/scsi/st.c
View File

@ -26,7 +26,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* *
* $Id: st.c,v 1.28 1994/04/13 05:43:21 mycroft Exp $ * $Id: st.c,v 1.29 1994/04/24 05:40:05 mycroft Exp $
*/ */
/* /*
@ -892,7 +892,8 @@ ststrategy(bp)
/* /*
* as are out-of-range requests on variable drives. * as are out-of-range requests on variable drives.
*/ */
else if (bp->b_bcount < st->blkmin || bp->b_bcount > st->blkmax) { else if (bp->b_bcount < st->blkmin ||
(st->blkmax && bp->b_bcount > st->blkmax)) {
printf("%s: bad request, must be between %d and %d\n", printf("%s: bad request, must be between %d and %d\n",
st->sc_dev.dv_xname, st->blkmin, st->blkmax); st->sc_dev.dv_xname, st->blkmin, st->blkmax);
bp->b_error = EIO; bp->b_error = EIO;