From owner-svn-src-all@FreeBSD.ORG Wed Sep 26 14:17:14 2012 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id E48A9106566B; Wed, 26 Sep 2012 14:17:14 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id CEF758FC1F; Wed, 26 Sep 2012 14:17:14 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q8QEHEth040016; Wed, 26 Sep 2012 14:17:14 GMT (envelope-from jhb@svn.freebsd.org) Received: (from jhb@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q8QEHEha040011; Wed, 26 Sep 2012 14:17:14 GMT (envelope-from jhb@svn.freebsd.org) Message-Id: <201209261417.q8QEHEha040011@svn.freebsd.org> From: John Baldwin Date: Wed, 26 Sep 2012 14:17:14 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r240963 - head/sys/dev/mlx X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 26 Sep 2012 14:17:15 -0000 Author: jhb Date: Wed Sep 26 14:17:14 2012 New Revision: 240963 URL: http://svn.freebsd.org/changeset/base/240963 Log: Remove FreeBSD 4.x compat shims. Verified by md5. Deleted: head/sys/dev/mlx/mlx_compat.h Modified: head/sys/dev/mlx/mlx.c head/sys/dev/mlx/mlx_disk.c head/sys/dev/mlx/mlx_pci.c head/sys/dev/mlx/mlxvar.h Modified: head/sys/dev/mlx/mlx.c ============================================================================== --- head/sys/dev/mlx/mlx.c Wed Sep 26 14:14:06 2012 (r240962) +++ head/sys/dev/mlx/mlx.c Wed Sep 26 14:17:14 2012 (r240963) @@ -32,6 +32,7 @@ #include #include +#include #include #include #include @@ -49,7 +50,6 @@ #include -#include #include #include #include @@ -307,7 +307,7 @@ mlx_attach(struct mlx_softc *sc) */ TAILQ_INIT(&sc->mlx_work); TAILQ_INIT(&sc->mlx_freecmds); - MLX_BIO_QINIT(sc->mlx_bioq); + bioq_init(&sc->mlx_bioq); /* * Select accessor methods based on controller interface type. @@ -731,13 +731,13 @@ mlx_intr(void *arg) * disk resource, then poke the disk resource to start as much work as it can. */ int -mlx_submit_buf(struct mlx_softc *sc, mlx_bio *bp) +mlx_submit_buf(struct mlx_softc *sc, struct bio *bp) { debug_called(1); MLX_IO_ASSERT_LOCKED(sc); - MLX_BIO_QINSERT(sc->mlx_bioq, bp); + bioq_insert_tail(&sc->mlx_bioq, bp); sc->mlx_waitbufs++; mlx_startio(sc); return(0); @@ -1838,7 +1838,7 @@ mlx_startio_cb(void *arg, bus_dma_segmen struct mlx_command *mc; struct mlxd_softc *mlxd; struct mlx_softc *sc; - mlx_bio *bp; + struct bio *bp; int blkcount; int driveno; int cmd; @@ -1849,7 +1849,7 @@ mlx_startio_cb(void *arg, bus_dma_segmen sc = mc->mc_sc; bp = mc->mc_private; - if (MLX_BIO_IS_READ(bp)) { + if (bp->bio_cmd == BIO_READ) { mc->mc_flags |= MLX_CMD_DATAIN; cmd = MLX_CMD_READSG; } else { @@ -1858,14 +1858,14 @@ mlx_startio_cb(void *arg, bus_dma_segmen } /* build a suitable I/O command (assumes 512-byte rounded transfers) */ - mlxd = (struct mlxd_softc *)MLX_BIO_SOFTC(bp); + mlxd = bp->bio_disk->d_drv1; driveno = mlxd->mlxd_drive - sc->mlx_sysdrive; - blkcount = (MLX_BIO_LENGTH(bp) + MLX_BLKSIZE - 1) / MLX_BLKSIZE; + blkcount = (bp->bio_bcount + MLX_BLKSIZE - 1) / MLX_BLKSIZE; - if ((MLX_BIO_LBA(bp) + blkcount) > sc->mlx_sysdrive[driveno].ms_size) + if ((bp->bio_pblkno + blkcount) > sc->mlx_sysdrive[driveno].ms_size) device_printf(sc->mlx_dev, "I/O beyond end of unit (%lld,%d > %lu)\n", - (long long)MLX_BIO_LBA(bp), blkcount, + (long long)bp->bio_pblkno, blkcount, (u_long)sc->mlx_sysdrive[driveno].ms_size); /* @@ -1876,7 +1876,7 @@ mlx_startio_cb(void *arg, bus_dma_segmen mlx_make_type1(mc, (cmd == MLX_CMD_WRITESG) ? MLX_CMD_WRITESG_OLD : MLX_CMD_READSG_OLD, blkcount & 0xff, /* xfer length low byte */ - MLX_BIO_LBA(bp), /* physical block number */ + bp->bio_pblkno, /* physical block number */ driveno, /* target drive number */ mc->mc_sgphys, /* location of SG list */ mc->mc_nsgent & 0x3f); /* size of SG list */ @@ -1885,7 +1885,7 @@ mlx_startio_cb(void *arg, bus_dma_segmen blkcount & 0xff, /* xfer length low byte */ (driveno << 3) | ((blkcount >> 8) & 0x07), /* target+length high 3 bits */ - MLX_BIO_LBA(bp), /* physical block number */ + bp->bio_pblkno, /* physical block number */ mc->mc_sgphys, /* location of SG list */ mc->mc_nsgent & 0x3f); /* size of SG list */ } @@ -1908,7 +1908,7 @@ static void mlx_startio(struct mlx_softc *sc) { struct mlx_command *mc; - mlx_bio *bp; + struct bio *bp; int error; MLX_IO_ASSERT_LOCKED(sc); @@ -1919,7 +1919,7 @@ mlx_startio(struct mlx_softc *sc) break; /* see if there's work to be done */ - if ((bp = MLX_BIO_QFIRST(sc->mlx_bioq)) == NULL) + if ((bp = bioq_first(&sc->mlx_bioq)) == NULL) break; /* get a command */ if ((mc = mlx_alloccmd(sc)) == NULL) @@ -1930,14 +1930,14 @@ mlx_startio(struct mlx_softc *sc) break; } /* get the buf containing our work */ - MLX_BIO_QREMOVE(sc->mlx_bioq, bp); + bioq_remove(&sc->mlx_bioq, bp); sc->mlx_waitbufs--; /* connect the buf to the command */ mc->mc_complete = mlx_completeio; mc->mc_private = bp; - mc->mc_data = MLX_BIO_DATA(bp); - mc->mc_length = MLX_BIO_LENGTH(bp); + mc->mc_data = bp->bio_data; + mc->mc_length = bp->bio_bcount; /* map the command so the controller can work with it */ error = bus_dmamap_load(sc->mlx_buffer_dmat, mc->mc_dmamap, mc->mc_data, @@ -1956,12 +1956,13 @@ static void mlx_completeio(struct mlx_command *mc) { struct mlx_softc *sc = mc->mc_sc; - mlx_bio *bp = (mlx_bio *)mc->mc_private; - struct mlxd_softc *mlxd = (struct mlxd_softc *)MLX_BIO_SOFTC(bp); + struct bio *bp = mc->mc_private; + struct mlxd_softc *mlxd = bp->bio_disk->d_drv1; MLX_IO_ASSERT_LOCKED(sc); if (mc->mc_status != MLX_STATUS_OK) { /* could be more verbose here? */ - MLX_BIO_SET_ERROR(bp, EIO); + bp->bio_error = EIO; + bp->bio_flags |= BIO_ERROR; switch(mc->mc_status) { case MLX_STATUS_RDWROFFLINE: /* system drive has gone offline */ @@ -1974,7 +1975,7 @@ mlx_completeio(struct mlx_command *mc) 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_pblkno %d\n", - MLX_BIO_LENGTH(bp), MLX_BIO_LENGTH(bp) / MLX_BLKSIZE, MLX_BIO_LBA(bp)); + bp->bio_bcount, bp->bio_bcount / MLX_BLKSIZE, bp->bio_pblkno); device_printf(sc->mlx_dev, " %13D\n", mc->mc_mailbox, " "); #endif break; Modified: head/sys/dev/mlx/mlx_disk.c ============================================================================== --- head/sys/dev/mlx/mlx_disk.c Wed Sep 26 14:14:06 2012 (r240962) +++ head/sys/dev/mlx/mlx_disk.c Wed Sep 26 14:17:14 2012 (r240963) @@ -35,6 +35,7 @@ __FBSDID("$FreeBSD$"); #include #include +#include #include #include #include @@ -48,7 +49,6 @@ __FBSDID("$FreeBSD$"); #include -#include #include #include #include @@ -142,15 +142,16 @@ mlxd_ioctl(struct disk *dp, u_long cmd, * be a multiple of a sector in length. */ static void -mlxd_strategy(mlx_bio *bp) +mlxd_strategy(struct bio *bp) { - struct mlxd_softc *sc = (struct mlxd_softc *)MLX_BIO_SOFTC(bp); + struct mlxd_softc *sc = bp->bio_disk->d_drv1; debug_called(1); /* bogus disk? */ if (sc == NULL) { - MLX_BIO_SET_ERROR(bp, EINVAL); + bp->bio_error = EINVAL; + bp->bio_flags |= BIO_ERROR; goto bad; } @@ -158,11 +159,11 @@ mlxd_strategy(mlx_bio *bp) MLX_IO_LOCK(sc->mlxd_controller); if (sc->mlxd_drive->ms_state == MLX_SYSD_OFFLINE) { MLX_IO_UNLOCK(sc->mlxd_controller); - MLX_BIO_SET_ERROR(bp, ENXIO); + bp->bio_error = ENXIO; + bp->bio_flags |= BIO_ERROR; goto bad; } - MLX_BIO_STATS_START(bp); mlx_submit_buf(sc->mlxd_controller, bp); MLX_IO_UNLOCK(sc->mlxd_controller); return; @@ -171,25 +172,23 @@ mlxd_strategy(mlx_bio *bp) /* * Correctly set the bio to indicate a failed tranfer. */ - MLX_BIO_RESID(bp) = MLX_BIO_LENGTH(bp); - MLX_BIO_DONE(bp); + bp->bio_resid = bp->bio_bcount; + biodone(bp); return; } void -mlxd_intr(void *data) +mlxd_intr(struct bio *bp) { - mlx_bio *bp = (mlx_bio *)data; debug_called(1); - if (MLX_BIO_HAS_ERROR(bp)) - MLX_BIO_SET_ERROR(bp, EIO); + if (bp->bio_flags & BIO_ERROR) + bp->bio_error = EIO; else - MLX_BIO_RESID(bp) = 0; + bp->bio_resid = 0; - MLX_BIO_STATS_END(bp); - MLX_BIO_DONE(bp); + biodone(bp); } static int Modified: head/sys/dev/mlx/mlx_pci.c ============================================================================== --- head/sys/dev/mlx/mlx_pci.c Wed Sep 26 14:14:06 2012 (r240962) +++ head/sys/dev/mlx/mlx_pci.c Wed Sep 26 14:17:14 2012 (r240963) @@ -29,6 +29,7 @@ __FBSDID("$FreeBSD$"); #include #include +#include #include #include #include @@ -47,7 +48,6 @@ __FBSDID("$FreeBSD$"); #include #include -#include #include #include #include Modified: head/sys/dev/mlx/mlxvar.h ============================================================================== --- head/sys/dev/mlx/mlxvar.h Wed Sep 26 14:14:06 2012 (r240962) +++ head/sys/dev/mlx/mlxvar.h Wed Sep 26 14:17:14 2012 (r240963) @@ -135,7 +135,7 @@ struct mlx_softc struct mlx_command *mlx_busycmd[MLX_NSLOTS]; /* busy commands */ int mlx_busycmds; /* count of busy commands */ struct mlx_sysdrive mlx_sysdrive[MLX_MAXDRIVES]; /* system drives */ - mlx_bioq mlx_bioq; /* outstanding I/O operations */ + struct bio_queue_head mlx_bioq; /* outstanding I/O operations */ int mlx_waitbufs; /* number of bufs awaiting commands */ /* controller status */ @@ -221,10 +221,10 @@ struct mlxd_softc /* * Interface between driver core and disk driver (should be using a bus?) */ -extern int mlx_submit_buf(struct mlx_softc *sc, mlx_bio *bp); +extern int mlx_submit_buf(struct mlx_softc *sc, struct bio *bp); extern int mlx_submit_ioctl(struct mlx_softc *sc, struct mlx_sysdrive *drive, u_long cmd, caddr_t addr, int32_t flag, struct thread *td); -extern void mlxd_intr(void *data); +extern void mlxd_intr(struct bio *bp);