From bfabff54fefc317170877a2d6fcaabd812fa6ffe Mon Sep 17 00:00:00 2001 From: phk Date: Fri, 3 Jan 2003 05:51:11 +0000 Subject: Remove unused second argument from BIO_STRATEGY() --- sys/dev/ccd/ccd.c | 10 +++++----- sys/dev/raidframe/rf_freebsdkintf.c | 2 +- sys/geom/geom_ccd.c | 10 +++++----- sys/sys/conf.h | 12 ++---------- sys/sys/linedisc.h | 12 ++---------- 5 files changed, 15 insertions(+), 31 deletions(-) diff --git a/sys/dev/ccd/ccd.c b/sys/dev/ccd/ccd.c index c9f9650..638c5b7 100644 --- a/sys/dev/ccd/ccd.c +++ b/sys/dev/ccd/ccd.c @@ -911,8 +911,8 @@ ccdstart(struct ccd_s *cs, struct bio *bp) * also try to avoid hogging. */ if (cbp[0]->cb_buf.bio_cmd == BIO_WRITE) { - BIO_STRATEGY(&cbp[0]->cb_buf, 0); - BIO_STRATEGY(&cbp[1]->cb_buf, 0); + BIO_STRATEGY(&cbp[0]->cb_buf); + BIO_STRATEGY(&cbp[1]->cb_buf); } else { int pick = cs->sc_pick; daddr_t range = cs->sc_size / 16; @@ -923,13 +923,13 @@ ccdstart(struct ccd_s *cs, struct bio *bp) cs->sc_pick = pick = 1 - pick; } cs->sc_blk[pick] = bn + btodb(rcount); - BIO_STRATEGY(&cbp[pick]->cb_buf, 0); + BIO_STRATEGY(&cbp[pick]->cb_buf); } } else { /* * Not mirroring */ - BIO_STRATEGY(&cbp[0]->cb_buf, 0); + BIO_STRATEGY(&cbp[0]->cb_buf); } bn += btodb(rcount); addr += rcount; @@ -1216,7 +1216,7 @@ ccdiodone(struct bio *ibp) if (cbp->cb_buf.bio_flags & BIO_ERROR) { cbp->cb_mirror->cb_pflags |= CCDPF_MIRROR_DONE; - BIO_STRATEGY(&cbp->cb_mirror->cb_buf, 0); + BIO_STRATEGY(&cbp->cb_mirror->cb_buf); putccdbuf(cbp); splx(s); return; diff --git a/sys/dev/raidframe/rf_freebsdkintf.c b/sys/dev/raidframe/rf_freebsdkintf.c index 5e134d7..ad6ea11 100644 --- a/sys/dev/raidframe/rf_freebsdkintf.c +++ b/sys/dev/raidframe/rf_freebsdkintf.c @@ -1649,7 +1649,7 @@ rf_DispatchKernelIO(queue, req) raidbp->rf_buf.b_vp->v_numoutput++; } #endif - BIO_STRATEGY(&raidbp->rf_buf, 0); + BIO_STRATEGY(&raidbp->rf_buf); break; diff --git a/sys/geom/geom_ccd.c b/sys/geom/geom_ccd.c index c9f9650..638c5b7 100644 --- a/sys/geom/geom_ccd.c +++ b/sys/geom/geom_ccd.c @@ -911,8 +911,8 @@ ccdstart(struct ccd_s *cs, struct bio *bp) * also try to avoid hogging. */ if (cbp[0]->cb_buf.bio_cmd == BIO_WRITE) { - BIO_STRATEGY(&cbp[0]->cb_buf, 0); - BIO_STRATEGY(&cbp[1]->cb_buf, 0); + BIO_STRATEGY(&cbp[0]->cb_buf); + BIO_STRATEGY(&cbp[1]->cb_buf); } else { int pick = cs->sc_pick; daddr_t range = cs->sc_size / 16; @@ -923,13 +923,13 @@ ccdstart(struct ccd_s *cs, struct bio *bp) cs->sc_pick = pick = 1 - pick; } cs->sc_blk[pick] = bn + btodb(rcount); - BIO_STRATEGY(&cbp[pick]->cb_buf, 0); + BIO_STRATEGY(&cbp[pick]->cb_buf); } } else { /* * Not mirroring */ - BIO_STRATEGY(&cbp[0]->cb_buf, 0); + BIO_STRATEGY(&cbp[0]->cb_buf); } bn += btodb(rcount); addr += rcount; @@ -1216,7 +1216,7 @@ ccdiodone(struct bio *ibp) if (cbp->cb_buf.bio_flags & BIO_ERROR) { cbp->cb_mirror->cb_pflags |= CCDPF_MIRROR_DONE; - BIO_STRATEGY(&cbp->cb_mirror->cb_buf, 0); + BIO_STRATEGY(&cbp->cb_mirror->cb_buf); putccdbuf(cbp); splx(s); return; diff --git a/sys/sys/conf.h b/sys/sys/conf.h index 15108c2..a36fea7 100644 --- a/sys/sys/conf.h +++ b/sys/sys/conf.h @@ -166,15 +166,7 @@ typedef int l_rint_t(int c, struct tty *tp); typedef int l_start_t(struct tty *tp); typedef int l_modem_t(struct tty *tp, int flag); -/* - * XXX: The dummy argument can be used to do what strategy1() never - * did anywhere: Create a per device flag to lock the device during - * label/slice surgery, all calls with a dummy == 0 gets stalled on - * a queue somewhere, whereas dummy == 1 are let through. Once out - * of surgery, reset the flag and restart all the stuff on the stall - * queue. - */ -#define BIO_STRATEGY(bp, dummy) \ +#define BIO_STRATEGY(bp) \ do { \ if ((!(bp)->bio_cmd) || ((bp)->bio_cmd & ((bp)->bio_cmd - 1))) \ Debugger("bio_cmd botch"); \ @@ -189,7 +181,7 @@ typedef int l_modem_t(struct tty *tp, int flag); (bp)->b_io.bio_offset = dbtob((bp)->b_blkno); \ (bp)->b_io.bio_done = bufdonebio; \ (bp)->b_io.bio_caller2 = (bp); \ - BIO_STRATEGY(&(bp)->b_io, dummy); \ + BIO_STRATEGY(&(bp)->b_io); \ } while (0) #endif /* _KERNEL */ diff --git a/sys/sys/linedisc.h b/sys/sys/linedisc.h index 15108c2..a36fea7 100644 --- a/sys/sys/linedisc.h +++ b/sys/sys/linedisc.h @@ -166,15 +166,7 @@ typedef int l_rint_t(int c, struct tty *tp); typedef int l_start_t(struct tty *tp); typedef int l_modem_t(struct tty *tp, int flag); -/* - * XXX: The dummy argument can be used to do what strategy1() never - * did anywhere: Create a per device flag to lock the device during - * label/slice surgery, all calls with a dummy == 0 gets stalled on - * a queue somewhere, whereas dummy == 1 are let through. Once out - * of surgery, reset the flag and restart all the stuff on the stall - * queue. - */ -#define BIO_STRATEGY(bp, dummy) \ +#define BIO_STRATEGY(bp) \ do { \ if ((!(bp)->bio_cmd) || ((bp)->bio_cmd & ((bp)->bio_cmd - 1))) \ Debugger("bio_cmd botch"); \ @@ -189,7 +181,7 @@ typedef int l_modem_t(struct tty *tp, int flag); (bp)->b_io.bio_offset = dbtob((bp)->b_blkno); \ (bp)->b_io.bio_done = bufdonebio; \ (bp)->b_io.bio_caller2 = (bp); \ - BIO_STRATEGY(&(bp)->b_io, dummy); \ + BIO_STRATEGY(&(bp)->b_io); \ } while (0) #endif /* _KERNEL */ -- cgit v1.1