[src/trunk]: src/sys/kern Use consistently "bufq_private(bufq)" instead of "b...

[kamil <kamil%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/df2831059667
branches:  trunk
changeset: 823713:df2831059667
user:      kamil <kamil%NetBSD.org@localhost>
date:      Thu May 04 11:03:27 2017 +0000

description:
Use consistently "bufq_private(bufq)" instead of "bufq->bq_private"

No functional change.

diffstat:

 sys/kern/bufq_disksort.c  |   8 ++++----
 sys/kern/bufq_fcfs.c      |  10 +++++-----
 sys/kern/bufq_priocscan.c |  10 +++++-----
 sys/kern/bufq_readprio.c  |  10 +++++-----
 4 files changed, 19 insertions(+), 19 deletions(-)

diffs (171 lines):

diff -r 08d5c0aa9e11 -r df2831059667 sys/kern/bufq_disksort.c
--- a/sys/kern/bufq_disksort.c  Thu May 04 11:01:16 2017 +0000
+++ b/sys/kern/bufq_disksort.c  Thu May 04 11:03:27 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: bufq_disksort.c,v 1.13 2016/11/16 10:42:14 pgoyette Exp $      */
+/*     $NetBSD: bufq_disksort.c,v 1.14 2017/05/04 11:03:27 kamil Exp $ */
 /*     NetBSD: subr_disk.c,v 1.61 2004/09/25 03:30:44 thorpej Exp      */
 
 /*-
@@ -68,7 +68,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bufq_disksort.c,v 1.13 2016/11/16 10:42:14 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bufq_disksort.c,v 1.14 2017/05/04 11:03:27 kamil Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -181,7 +181,7 @@
 static struct buf *
 bufq_disksort_get(struct bufq_state *bufq, int remove)
 {
-       struct bufq_disksort *disksort = bufq->bq_private;
+       struct bufq_disksort *disksort = bufq_private(bufq);
        struct buf *bp;
 
        bp = TAILQ_FIRST(&disksort->bq_head);
@@ -195,7 +195,7 @@
 static struct buf *
 bufq_disksort_cancel(struct bufq_state *bufq, struct buf *buf)
 {
-       struct bufq_disksort *disksort = bufq->bq_private;
+       struct bufq_disksort *disksort = bufq_private(bufq);
        struct buf *bq;
 
        TAILQ_FOREACH(bq, &disksort->bq_head, b_actq) {
diff -r 08d5c0aa9e11 -r df2831059667 sys/kern/bufq_fcfs.c
--- a/sys/kern/bufq_fcfs.c      Thu May 04 11:01:16 2017 +0000
+++ b/sys/kern/bufq_fcfs.c      Thu May 04 11:03:27 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: bufq_fcfs.c,v 1.12 2016/11/16 10:42:14 pgoyette Exp $  */
+/*     $NetBSD: bufq_fcfs.c,v 1.13 2017/05/04 11:03:27 kamil Exp $     */
 /*     NetBSD: subr_disk.c,v 1.61 2004/09/25 03:30:44 thorpej Exp      */
 
 /*-
@@ -68,7 +68,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bufq_fcfs.c,v 1.12 2016/11/16 10:42:14 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bufq_fcfs.c,v 1.13 2017/05/04 11:03:27 kamil Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -97,7 +97,7 @@
 static void
 bufq_fcfs_put(struct bufq_state *bufq, struct buf *bp)
 {
-       struct bufq_fcfs *fcfs = bufq->bq_private;
+       struct bufq_fcfs *fcfs = bufq_private(bufq);
 
        TAILQ_INSERT_TAIL(&fcfs->bq_head, bp, b_actq);
 }
@@ -105,7 +105,7 @@
 static struct buf *
 bufq_fcfs_get(struct bufq_state *bufq, int remove)
 {
-       struct bufq_fcfs *fcfs = bufq->bq_private;
+       struct bufq_fcfs *fcfs = bufq_private(bufq);
        struct buf *bp;
 
        bp = TAILQ_FIRST(&fcfs->bq_head);
@@ -119,7 +119,7 @@
 static struct buf *
 bufq_fcfs_cancel(struct bufq_state *bufq, struct buf *buf)
 {
-       struct bufq_fcfs *fcfs = bufq->bq_private;
+       struct bufq_fcfs *fcfs = bufq_private(bufq);
        struct buf *bp;
 
        TAILQ_FOREACH(bp, &fcfs->bq_head, b_actq) {
diff -r 08d5c0aa9e11 -r df2831059667 sys/kern/bufq_priocscan.c
--- a/sys/kern/bufq_priocscan.c Thu May 04 11:01:16 2017 +0000
+++ b/sys/kern/bufq_priocscan.c Thu May 04 11:03:27 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: bufq_priocscan.c,v 1.20 2016/11/16 10:42:14 pgoyette Exp $     */
+/*     $NetBSD: bufq_priocscan.c,v 1.21 2017/05/04 11:03:27 kamil Exp $        */
 
 /*-
  * Copyright (c)2004,2005,2006,2008,2009,2011,2012 YAMAMOTO Takashi,
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bufq_priocscan.c,v 1.20 2016/11/16 10:42:14 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bufq_priocscan.c,v 1.21 2017/05/04 11:03:27 kamil Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -263,7 +263,7 @@
 static void
 bufq_priocscan_put(struct bufq_state *bufq, struct buf *bp)
 {
-       struct bufq_priocscan *q = bufq->bq_private;
+       struct bufq_priocscan *q = bufq_private(bufq);
        struct cscan_queue *cq;
 
        cq = bufq_priocscan_selectqueue(q, bp);
@@ -273,7 +273,7 @@
 static struct buf *
 bufq_priocscan_get(struct bufq_state *bufq, int remove)
 {
-       struct bufq_priocscan *q = bufq->bq_private;
+       struct bufq_priocscan *q = bufq_private(bufq);
        struct priocscan_queue *pq, *npq;
        struct priocscan_queue *first; /* highest priority non-empty queue */
        const struct priocscan_queue *epq;
@@ -394,7 +394,7 @@
 static struct buf *
 bufq_priocscan_cancel(struct bufq_state *bufq, struct buf *bp)
 {
-       struct bufq_priocscan * const q = bufq->bq_private;
+       struct bufq_priocscan * const q = bufq_private(bufq);
        unsigned int i;
 
        for (i = 0; i < PRIOCSCAN_NQUEUE; i++) {
diff -r 08d5c0aa9e11 -r df2831059667 sys/kern/bufq_readprio.c
--- a/sys/kern/bufq_readprio.c  Thu May 04 11:01:16 2017 +0000
+++ b/sys/kern/bufq_readprio.c  Thu May 04 11:03:27 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: bufq_readprio.c,v 1.15 2016/11/16 10:42:14 pgoyette Exp $      */
+/*     $NetBSD: bufq_readprio.c,v 1.16 2017/05/04 11:03:27 kamil Exp $ */
 /*     NetBSD: subr_disk.c,v 1.61 2004/09/25 03:30:44 thorpej Exp      */
 
 /*-
@@ -68,7 +68,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bufq_readprio.c,v 1.15 2016/11/16 10:42:14 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bufq_readprio.c,v 1.16 2017/05/04 11:03:27 kamil Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -108,7 +108,7 @@
 static void
 bufq_prio_put(struct bufq_state *bufq, struct buf *bp)
 {
-       struct bufq_prio *prio = bufq->bq_private;
+       struct bufq_prio *prio = bufq_private(bufq);
        struct buf *bq;
        int sortby;
 
@@ -155,7 +155,7 @@
 static struct buf *
 bufq_prio_get(struct bufq_state *bufq, int remove)
 {
-       struct bufq_prio *prio = bufq->bq_private;
+       struct bufq_prio *prio = bufq_private(bufq);
        struct buf *bp;
 
        /*
@@ -218,7 +218,7 @@
 static struct buf *
 bufq_prio_cancel(struct bufq_state *bufq, struct buf *buf)
 {
-       struct bufq_prio *prio = bufq->bq_private;
+       struct bufq_prio *prio = bufq_private(bufq);
        struct buf *bq;
 
        /* search read queue */