mirror of
https://git.FreeBSD.org/src.git
synced 2024-12-14 10:09:48 +00:00
Remove unused second argument from DEV_STRATEGY().
This commit is contained in:
parent
49247edca6
commit
e2a3ea1c45
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=108586
@ -1971,7 +1971,7 @@ raidread_component_label(dev, b_vp, clabel)
|
||||
bp->b_iocmd = BIO_READ;
|
||||
bp->b_resid = RF_COMPONENT_INFO_SIZE / DEV_BSIZE;
|
||||
|
||||
DEV_STRATEGY(bp, 0);
|
||||
DEV_STRATEGY(bp);
|
||||
error = bufwait(bp);
|
||||
|
||||
if (!error) {
|
||||
@ -2014,7 +2014,7 @@ raidwrite_component_label(dev, b_vp, clabel)
|
||||
|
||||
memcpy(bp->b_data, clabel, sizeof(RF_ComponentLabel_t));
|
||||
|
||||
DEV_STRATEGY(bp, 0);
|
||||
DEV_STRATEGY(bp);
|
||||
error = bufwait(bp);
|
||||
|
||||
bp->b_flags |= B_INVAL | B_AGE;
|
||||
|
@ -210,7 +210,7 @@ recover_io(struct request *rq)
|
||||
*
|
||||
* Negotiate with phk to get it fixed.
|
||||
*/
|
||||
DEV_STRATEGY(rq->bp, 0); /* reissue the command */
|
||||
DEV_STRATEGY(rq->bp); /* reissue the command */
|
||||
}
|
||||
|
||||
/* Functions called to interface with the daemon */
|
||||
|
@ -420,7 +420,7 @@ complete_raid5_write(struct rqelement *rqe)
|
||||
if (debug & DEBUG_LASTREQS)
|
||||
logrq(loginfo_raid5_data, (union rqinfou) rqe, ubp);
|
||||
#endif
|
||||
DEV_STRATEGY(&rqe->b, 0);
|
||||
DEV_STRATEGY(&rqe->b);
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -459,7 +459,7 @@ complete_raid5_write(struct rqelement *rqe)
|
||||
if (debug & DEBUG_LASTREQS)
|
||||
logrq(loginfo_raid5_parity, (union rqinfou) rqe, ubp);
|
||||
#endif
|
||||
DEV_STRATEGY(&rqe->b, 0);
|
||||
DEV_STRATEGY(&rqe->b);
|
||||
}
|
||||
|
||||
/* Local Variables: */
|
||||
|
@ -281,7 +281,7 @@ driveio(struct drive *drive, char *buf, size_t length, off_t offset, int flag)
|
||||
bp->b_saveaddr = bp->b_data;
|
||||
bp->b_data = buf;
|
||||
bp->b_bcount = len;
|
||||
DEV_STRATEGY(bp, 0); /* initiate the transfer */
|
||||
DEV_STRATEGY(bp); /* initiate the transfer */
|
||||
error = bufwait(bp);
|
||||
bp->b_data = bp->b_saveaddr;
|
||||
bp->b_flags |= B_INVAL | B_AGE;
|
||||
@ -758,7 +758,7 @@ write_volume_label(int volno)
|
||||
*
|
||||
* Negotiate with phk to get it fixed.
|
||||
*/
|
||||
DEV_STRATEGY(bp, 0);
|
||||
DEV_STRATEGY(bp);
|
||||
error = bufwait(bp);
|
||||
bp->b_flags |= B_INVAL | B_AGE;
|
||||
bp->b_ioflags &= ~BIO_ERROR;
|
||||
|
@ -439,7 +439,7 @@ launch_requests(struct request *rq, int reviveok)
|
||||
logrq(loginfo_rqe, (union rqinfou) rqe, rq->bp);
|
||||
#endif
|
||||
/* fire off the request */
|
||||
DEV_STRATEGY(&rqe->b, 0);
|
||||
DEV_STRATEGY(&rqe->b);
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -983,7 +983,7 @@ sdio(struct buf *bp)
|
||||
if (debug & DEBUG_LASTREQS)
|
||||
logrq(loginfo_sdiol, (union rqinfou) &sbp->b, &sbp->b);
|
||||
#endif
|
||||
DEV_STRATEGY(&sbp->b, 0);
|
||||
DEV_STRATEGY(&sbp->b);
|
||||
splx(s);
|
||||
}
|
||||
|
||||
|
@ -602,10 +602,10 @@ spec_strategy(ap)
|
||||
|
||||
if (dsw->d_flags & D_NOGIANT) {
|
||||
DROP_GIANT();
|
||||
DEV_STRATEGY(bp, 0);
|
||||
DEV_STRATEGY(bp);
|
||||
PICKUP_GIANT();
|
||||
} else
|
||||
DEV_STRATEGY(bp, 0);
|
||||
DEV_STRATEGY(bp);
|
||||
|
||||
return (0);
|
||||
}
|
||||
@ -635,7 +635,7 @@ spec_freeblks(ap)
|
||||
bp->b_offset = dbtob(ap->a_addr);
|
||||
bp->b_bcount = ap->a_length;
|
||||
BUF_KERNPROC(bp);
|
||||
DEV_STRATEGY(bp, 0);
|
||||
DEV_STRATEGY(bp);
|
||||
return (0);
|
||||
}
|
||||
|
||||
|
@ -104,7 +104,7 @@ physio(dev_t dev, struct uio *uio, int ioflag)
|
||||
vmapbuf(bp);
|
||||
}
|
||||
|
||||
DEV_STRATEGY(bp, 0);
|
||||
DEV_STRATEGY(bp);
|
||||
spl = splbio();
|
||||
while ((bp->b_flags & B_DONE) == 0)
|
||||
tsleep(bp, PRIBIO, "physstr", 0);
|
||||
|
@ -72,7 +72,7 @@ readdisklabel(dev, lp)
|
||||
bp->b_bcount = lp->d_secsize;
|
||||
bp->b_flags &= ~B_INVAL;
|
||||
bp->b_iocmd = BIO_READ;
|
||||
DEV_STRATEGY(bp, 1);
|
||||
DEV_STRATEGY(bp);
|
||||
if (bufwait(bp))
|
||||
msg = "I/O error";
|
||||
else if (bp->b_resid != 0)
|
||||
@ -177,7 +177,7 @@ writedisklabel(dev, lp)
|
||||
*/
|
||||
bp->b_flags &= ~B_INVAL;
|
||||
bp->b_iocmd = BIO_READ;
|
||||
DEV_STRATEGY(bp, 1);
|
||||
DEV_STRATEGY(bp);
|
||||
error = bufwait(bp);
|
||||
if (error)
|
||||
goto done;
|
||||
@ -197,7 +197,7 @@ writedisklabel(dev, lp)
|
||||
#ifdef __alpha__
|
||||
alpha_fix_srm_checksum(bp);
|
||||
#endif
|
||||
DEV_STRATEGY(bp, 1);
|
||||
DEV_STRATEGY(bp);
|
||||
error = bufwait(bp);
|
||||
goto done;
|
||||
}
|
||||
@ -210,7 +210,7 @@ writedisklabel(dev, lp)
|
||||
*dlp = *lp;
|
||||
bp->b_flags &= ~B_INVAL;
|
||||
bp->b_iocmd = BIO_WRITE;
|
||||
DEV_STRATEGY(bp, 1);
|
||||
DEV_STRATEGY(bp);
|
||||
error = bufwait(bp);
|
||||
#endif
|
||||
bp->b_flags |= B_INVAL | B_AGE;
|
||||
|
@ -214,7 +214,7 @@ dsinit(dev, lp, sspp)
|
||||
bp->b_blkno = mbr_offset;
|
||||
bp->b_bcount = lp->d_secsize;
|
||||
bp->b_iocmd = BIO_READ;
|
||||
DEV_STRATEGY(bp, 1);
|
||||
DEV_STRATEGY(bp);
|
||||
if (bufwait(bp) != 0) {
|
||||
disk_err(&bp->b_io, "reading primary partition table: error",
|
||||
0, 1);
|
||||
@ -416,7 +416,7 @@ mbr_extended(dev, lp, ssp, ext_offset, ext_size, base_ext_offset, nsectors,
|
||||
bp->b_blkno = ext_offset;
|
||||
bp->b_bcount = lp->d_secsize;
|
||||
bp->b_iocmd = BIO_READ;
|
||||
DEV_STRATEGY(bp, 1);
|
||||
DEV_STRATEGY(bp);
|
||||
if (bufwait(bp) != 0) {
|
||||
disk_err(&bp->b_io, "reading extended partition table: error",
|
||||
0, 1);
|
||||
|
@ -1139,7 +1139,7 @@ aio_qphysio(struct proc *p, struct aiocblist *aiocbe)
|
||||
splx(s);
|
||||
|
||||
/* Perform transfer. */
|
||||
DEV_STRATEGY(bp, 0);
|
||||
DEV_STRATEGY(bp);
|
||||
|
||||
notify = 0;
|
||||
s = splbio();
|
||||
|
@ -197,7 +197,7 @@ dsinit(dev, lp, sspp)
|
||||
bp->b_iocmd = BIO_READ;
|
||||
if (bp->b_bcount < 1024)
|
||||
bp->b_bcount = 1024;
|
||||
DEV_STRATEGY(bp, 1);
|
||||
DEV_STRATEGY(bp);
|
||||
if (bufwait(bp) != 0) {
|
||||
disk_err(&bp->b_io, "reading primary partition table: error",
|
||||
0, 1);
|
||||
|
@ -173,7 +173,7 @@ typedef int l_modem_t(struct tty *tp, int flag);
|
||||
(*devsw((bp)->bio_dev)->d_strategy)(bp); \
|
||||
} while (0)
|
||||
|
||||
#define DEV_STRATEGY(bp, dummy) \
|
||||
#define DEV_STRATEGY(bp) \
|
||||
do { \
|
||||
if ((bp)->b_flags & B_PHYS) \
|
||||
(bp)->b_io.bio_offset = (bp)->b_offset; \
|
||||
|
@ -173,7 +173,7 @@ typedef int l_modem_t(struct tty *tp, int flag);
|
||||
(*devsw((bp)->bio_dev)->d_strategy)(bp); \
|
||||
} while (0)
|
||||
|
||||
#define DEV_STRATEGY(bp, dummy) \
|
||||
#define DEV_STRATEGY(bp) \
|
||||
do { \
|
||||
if ((bp)->b_flags & B_PHYS) \
|
||||
(bp)->b_io.bio_offset = (bp)->b_offset; \
|
||||
|
Loading…
Reference in New Issue
Block a user