svn commit: r287638 - in head/sys: kern sys
Warner Losh
imp at FreeBSD.org
Fri Sep 11 00:38:59 UTC 2015
Author: imp
Date: Fri Sep 11 00:38:58 2015
New Revision: 287638
URL: https://svnweb.freebsd.org/changeset/base/287638
Log:
dev_strategy and dev_strategy_csw are unused since r281825. Remove
them.
Differential Revision: https://reviews.freebsd.org/D3620
Modified:
head/sys/kern/vfs_bio.c
head/sys/sys/conf.h
Modified: head/sys/kern/vfs_bio.c
==============================================================================
--- head/sys/kern/vfs_bio.c Fri Sep 11 00:20:15 2015 (r287637)
+++ head/sys/kern/vfs_bio.c Fri Sep 11 00:38:58 2015 (r287638)
@@ -3786,56 +3786,6 @@ bufdonebio(struct bio *bip)
g_destroy_bio(bip);
}
-void
-dev_strategy(struct cdev *dev, struct buf *bp)
-{
- struct cdevsw *csw;
- int ref;
-
- KASSERT(dev->si_refcount > 0,
- ("dev_strategy on un-referenced struct cdev *(%s) %p",
- devtoname(dev), dev));
-
- csw = dev_refthread(dev, &ref);
- dev_strategy_csw(dev, csw, bp);
- dev_relthread(dev, ref);
-}
-
-void
-dev_strategy_csw(struct cdev *dev, struct cdevsw *csw, struct buf *bp)
-{
- struct bio *bip;
-
- KASSERT(bp->b_iocmd == BIO_READ || bp->b_iocmd == BIO_WRITE,
- ("b_iocmd botch"));
- KASSERT(((dev->si_flags & SI_ETERNAL) != 0 && csw != NULL) ||
- dev->si_threadcount > 0,
- ("dev_strategy_csw threadcount cdev *(%s) %p", devtoname(dev),
- dev));
- if (csw == NULL) {
- bp->b_error = ENXIO;
- bp->b_ioflags = BIO_ERROR;
- bufdone(bp);
- return;
- }
- for (;;) {
- bip = g_new_bio();
- if (bip != NULL)
- break;
- /* Try again later */
- tsleep(&bp, PRIBIO, "dev_strat", hz/10);
- }
- bip->bio_cmd = bp->b_iocmd;
- bip->bio_offset = bp->b_iooffset;
- bip->bio_length = bp->b_bcount;
- bip->bio_bcount = bp->b_bcount; /* XXX: remove */
- bdata2bio(bp, bip);
- bip->bio_done = bufdonebio;
- bip->bio_caller2 = bp;
- bip->bio_dev = dev;
- (*csw->d_strategy)(bip);
-}
-
/*
* bufdone:
*
Modified: head/sys/sys/conf.h
==============================================================================
--- head/sys/sys/conf.h Fri Sep 11 00:20:15 2015 (r287637)
+++ head/sys/sys/conf.h Fri Sep 11 00:38:58 2015 (r287638)
@@ -240,8 +240,6 @@ void dev_depends(struct cdev *_pdev, str
void dev_ref(struct cdev *dev);
void dev_refl(struct cdev *dev);
void dev_rel(struct cdev *dev);
-void dev_strategy(struct cdev *dev, struct buf *bp);
-void dev_strategy_csw(struct cdev *dev, struct cdevsw *csw, struct buf *bp);
struct cdev *make_dev(struct cdevsw *_devsw, int _unit, uid_t _uid, gid_t _gid,
int _perms, const char *_fmt, ...) __printflike(6, 7);
struct cdev *make_dev_cred(struct cdevsw *_devsw, int _unit,
More information about the svn-src-all
mailing list