dsched(4): Some miscellaneous cleanup.
authorSascha Wildner <saw@online.de>
Mon, 20 Feb 2012 11:58:50 +0000 (12:58 +0100)
committerSascha Wildner <saw@online.de>
Mon, 20 Feb 2012 11:59:05 +0000 (12:59 +0100)
* Rename the bfq manpage to dsched_bfq(4), so that we don't run into
  name conflicts in the future. If someone wrote a manpage for
  dsched_as, it would have resulted in an as(4) manpage.

* Add options DSCHED_AS and DSCHED_BFQ to LINT*.

* Also, remove an unneeded check in dsched_as.

Makefile_upgrade.inc
share/man/man4/Makefile
share/man/man4/dsched.4
share/man/man4/dsched_bfq.4 [moved from share/man/man4/bfq.4 with 99% similarity]
sys/conf/files
sys/conf/options
sys/config/LINT
sys/config/LINT64
sys/kern/dsched/as/as.c

index e12e28e..74fe418 100644 (file)
@@ -1977,6 +1977,8 @@ TO_REMOVE+=/usr/share/man/man8/isdntrace.8.gz
 TO_REMOVE+=/usr/libexec/binutils221/elf/ld
 TO_REMOVE+=/usr/libexec/binutils222/elf/ld
 TO_REMOVE+=/usr/include/sys/dataacq.h
+TO_REMOVE+=/usr/share/man/cat4/bfq.4.gz
+TO_REMOVE+=/usr/share/man/man4/bfq.4.gz
 
 .if ${MACHINE_ARCH} == "x86_64"
 TO_REMOVE+=/usr/libdata/stallion/2681.sys
index 7533edd..61f77ef 100644 (file)
@@ -42,7 +42,6 @@ MAN=  aac.4 \
        axe.4 \
        bce.4 \
        bfe.4 \
-       bfq.4 \
        bge.4 \
        bktr.4 \
        blackhole.4 \
@@ -75,6 +74,7 @@ MAN=  aac.4 \
        dpt.4 \
        drm.4 \
        dsched.4 \
+       dsched_bfq.4 \
        dummynet.4 \
        ecc.4 \
        ed.4 \
index 70a8d6a..9bd02f3 100644 (file)
@@ -63,7 +63,7 @@ The following are informative only:
 shows all available dsched policies, separated by spaces.
 .El
 .Sh SEE ALSO
-.Xr bfq 4 ,
+.Xr dsched_bfq 4 ,
 .Xr loader.conf 5 ,
 .Xr sysctl.conf 5 ,
 .Xr dsched 9
similarity index 99%
rename from share/man/man4/bfq.4
rename to share/man/man4/dsched_bfq.4
index 30105a5..d8f3ecb 100644 (file)
 .\" SUCH DAMAGE.
 .\"
 .Dd August 19, 2011
-.Dt BFQ 8
+.Dt DSCHED_BFQ 4
 .Os
 .Sh NAME
-.Nm BFQ
+.Nm dsched_bfq
 .Nd Budget Fair Queueing disk scheduling policy
 .Sh SYNOPSIS
 To compile this driver into the kernel,
index ef876f0..870047c 100644 (file)
@@ -1991,6 +1991,7 @@ ${OSACPI_MI_DIR}/acpi_video/acpi_video.c  optional acpi_video acpi
 ${OSACPI_MI_DIR}/aibs/atk0110.c                        optional aibs acpi
 
 # dsched stuff
+kern/dsched/as/as.c                    optional dsched_as
 kern/dsched/fq/fq_core.c               optional dsched_fq
 kern/dsched/fq/fq_diskops.c            optional dsched_fq
 kern/dsched/bfq/bfq.c                  optional dsched_bfq
index 8604e18..e19094c 100644 (file)
@@ -652,8 +652,9 @@ SCTP_MAP_LOGGING    opt_sctp.h
 SYSLINK                        opt_syslink.h
 
 # DSCHED stuff
-DSCHED_FQ              opt_dsched.h
+DSCHED_AS              opt_dsched.h
 DSCHED_BFQ             opt_dsched.h
+DSCHED_FQ              opt_dsched.h
 
 # Receive Side Scaling (now basecode)
 RSS_DEBUG              opt_rss.h
index ba29df4..5467c5c 100644 (file)
@@ -2585,8 +2585,9 @@ options           SCTP_FR_LOGGING
 options                SCTP_MAP_LOGGING
 
 # DSCHED stuff
-options                DSCHED_FQ
+options                DSCHED_AS
 options                DSCHED_BFQ
+options                DSCHED_FQ
 
 # WATCHDOG
 options                WATCHDOG_ENABLE         # Enable watchdog support framework
index e34990b..6697cdd 100644 (file)
@@ -2354,6 +2354,8 @@ options           SCTP_FR_LOGGING
 options                SCTP_MAP_LOGGING
 
 # DSCHED stuff
+options                DSCHED_AS
+options                DSCHED_BFQ
 options                DSCHED_FQ
 
 # WATCHDOG
index 449f4ad..0f3d51f 100644 (file)
@@ -195,7 +195,7 @@ as_dequeue(struct dsched_disk_ctx *diskctx)
                bio = TAILQ_FIRST(&as_diskctx->as_queue_rd);
                tdio = dsched_get_bio_priv(bio);
                //kernel thread
-               if (!tdio->p || (uint32_t)(tdio->p) == ~0){
+               if (!tdio->p{
                        TAILQ_REMOVE(&as_diskctx->as_queue_rd, bio, link);
                        dsched_strategy_request_polling(as_diskctx->head.dp, bio, diskctx);
                } else {