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

Use the physical block number, not the logical block number, for I/O

Browse Source 
operations.  The latter only works where the partion begins at the bottom
of the disk.  Whoops.

Submitted by:	Chris Csanady <cc@137.org>
This commit is contained in:
Mike Smith 1999-10-22 20:55:15 +00:00
parent 5e73516b7b
commit cd4ace0c76
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=52439
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/dev/amr/amr.c
View File

@ -863,16 +863,16 @@ amr_startio(struct amr_softc *sc)
driveno = amrd->amrd_drive - &sc->amr_drive[0];
blkcount = bp->b_bcount / AMR_BLKSIZE;
if ((bp->b_blkno + blkcount) > sc->amr_drive[driveno].al_size)
if ((bp->b_pblkno + blkcount) > sc->amr_drive[driveno].al_size)
device_printf(sc->amr_dev, "I/O beyond end of unit (%u,%d > %u)\n",
bp->b_blkno, blkcount, sc->amr_drive[driveno].al_size);
bp->b_pblkno, blkcount, sc->amr_drive[driveno].al_size);
/*
* Build the I/O command.
*/
ac->ac_mailbox.mb_command = cmd;
ac->ac_mailbox.mb_blkcount = blkcount;
ac->ac_mailbox.mb_lba = bp->b_blkno;
ac->ac_mailbox.mb_lba = bp->b_pblkno;
ac->ac_mailbox.mb_physaddr = ac->ac_sgphys;
ac->ac_mailbox.mb_drive = driveno;
ac->ac_mailbox.mb_nsgelem = ac->ac_nsgent;

10
sys/dev/mlx/mlx.c
View File

@ -1621,9 +1621,9 @@ mlx_startio(struct mlx_softc *sc)
driveno = mlxd->mlxd_drive - &sc->mlx_sysdrive[0];
blkcount = bp->b_bcount / MLX_BLKSIZE;
if ((bp->b_blkno + blkcount) > sc->mlx_sysdrive[driveno].ms_size)
if ((bp->b_pblkno + blkcount) > sc->mlx_sysdrive[driveno].ms_size)
device_printf(sc->mlx_dev, "I/O beyond end of unit (%u,%d > %u)\n",
bp->b_blkno, blkcount, sc->mlx_sysdrive[driveno].ms_size);
bp->b_pblkno, blkcount, sc->mlx_sysdrive[driveno].ms_size);
/*
* Build the I/O command. Note that the SG list type bits are set to zero,
@ -1632,7 +1632,7 @@ mlx_startio(struct mlx_softc *sc)
mlx_make_type5(mc, cmd,
blkcount & 0xff, /* xfer length low byte */
(driveno << 3) | ((blkcount >> 8) & 0x07), /* target and length high 3 bits */
bp->b_blkno, /* physical block number */
bp->b_pblkno, /* physical block number */
mc->mc_sgphys, /* location of SG list */
mc->mc_nsgent & 0x3f); /* size of SG list (top 2 bits clear) */
@ -1670,8 +1670,8 @@ mlx_completeio(struct mlx_command *mc)
default: /* other I/O error */
device_printf(sc->mlx_dev, "I/O error - %s\n", mlx_diagnose_command(mc));
#if 0
device_printf(sc->mlx_dev, " b_bcount %ld blkcount %ld b_blkno %d\n",
bp->b_bcount, bp->b_bcount / MLX_BLKSIZE, bp->b_blkno);
device_printf(sc->mlx_dev, " b_bcount %ld blkcount %ld b_pblkno %d\n",
bp->b_bcount, bp->b_bcount / MLX_BLKSIZE, bp->b_pblkno);
device_printf(sc->mlx_dev, " %13D\n", mc->mc_mailbox, " ");
#endif
break;