summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorgallatin <gallatin@FreeBSD.org>2000-12-02 20:08:33 +0000
committergallatin <gallatin@FreeBSD.org>2000-12-02 20:08:33 +0000
commit397a29f11740a2c64b34ccd9e0b76d2f51c24df6 (patch)
tree70018d3b5dfd6f4e9a8a2d69b84b7a20b3474a68
parent85f201535ec7876eb3e31db14ab28d2fad68a842 (diff)
downloadFreeBSD-src-397a29f11740a2c64b34ccd9e0b76d2f51c24df6.zip
FreeBSD-src-397a29f11740a2c64b34ccd9e0b76d2f51c24df6.tar.gz
Correct int/long type mismatch in the proper place this time. freevnodes
and numvnodes are longs in the kernel. They should remain longs in systat, what really needs to change is that they should be using SYSCTL_LONG rather than SYSCTL_INT. I also changed wantfreevnodes to SYSCTL_LONG because I happened to notice it. I wish there was a way to find all of these automatically.. Pointed out by: bde
-rw-r--r--sys/kern/vfs_export.c6
-rw-r--r--sys/kern/vfs_subr.c6
-rw-r--r--usr.bin/systat/vmstat.c4
3 files changed, 8 insertions, 8 deletions
diff --git a/sys/kern/vfs_export.c b/sys/kern/vfs_export.c
index cf6029a..5042d28 100644
--- a/sys/kern/vfs_export.c
+++ b/sys/kern/vfs_export.c
@@ -92,7 +92,7 @@ static void vclean __P((struct vnode *vp, int flags, struct proc *p));
* allocates a new vnode, never decreased.
*/
static unsigned long numvnodes;
-SYSCTL_INT(_debug, OID_AUTO, numvnodes, CTLFLAG_RD, &numvnodes, 0, "");
+SYSCTL_LONG(_debug, OID_AUTO, numvnodes, CTLFLAG_RD, &numvnodes, 0, "");
/*
* Conversion tables for conversion from vnode types to inode formats
@@ -117,10 +117,10 @@ static TAILQ_HEAD(freelst, vnode) vnode_free_list;
* getnewvnode() will return a newly allocated vnode.
*/
static u_long wantfreevnodes = 25;
-SYSCTL_INT(_debug, OID_AUTO, wantfreevnodes, CTLFLAG_RW, &wantfreevnodes, 0, "");
+SYSCTL_LONG(_debug, OID_AUTO, wantfreevnodes, CTLFLAG_RW, &wantfreevnodes, 0, "");
/* Number of vnodes in the free list. */
static u_long freevnodes = 0;
-SYSCTL_INT(_debug, OID_AUTO, freevnodes, CTLFLAG_RD, &freevnodes, 0, "");
+SYSCTL_LONG(_debug, OID_AUTO, freevnodes, CTLFLAG_RD, &freevnodes, 0, "");
/*
* Various variables used for debugging the new implementation of
diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c
index cf6029a..5042d28 100644
--- a/sys/kern/vfs_subr.c
+++ b/sys/kern/vfs_subr.c
@@ -92,7 +92,7 @@ static void vclean __P((struct vnode *vp, int flags, struct proc *p));
* allocates a new vnode, never decreased.
*/
static unsigned long numvnodes;
-SYSCTL_INT(_debug, OID_AUTO, numvnodes, CTLFLAG_RD, &numvnodes, 0, "");
+SYSCTL_LONG(_debug, OID_AUTO, numvnodes, CTLFLAG_RD, &numvnodes, 0, "");
/*
* Conversion tables for conversion from vnode types to inode formats
@@ -117,10 +117,10 @@ static TAILQ_HEAD(freelst, vnode) vnode_free_list;
* getnewvnode() will return a newly allocated vnode.
*/
static u_long wantfreevnodes = 25;
-SYSCTL_INT(_debug, OID_AUTO, wantfreevnodes, CTLFLAG_RW, &wantfreevnodes, 0, "");
+SYSCTL_LONG(_debug, OID_AUTO, wantfreevnodes, CTLFLAG_RW, &wantfreevnodes, 0, "");
/* Number of vnodes in the free list. */
static u_long freevnodes = 0;
-SYSCTL_INT(_debug, OID_AUTO, freevnodes, CTLFLAG_RD, &freevnodes, 0, "");
+SYSCTL_LONG(_debug, OID_AUTO, freevnodes, CTLFLAG_RD, &freevnodes, 0, "");
/*
* Various variables used for debugging the new implementation of
diff --git a/usr.bin/systat/vmstat.c b/usr.bin/systat/vmstat.c
index 2617d2d..beb8e3c 100644
--- a/usr.bin/systat/vmstat.c
+++ b/usr.bin/systat/vmstat.c
@@ -80,8 +80,8 @@ static struct Info {
long *intrcnt;
int bufspace;
int desiredvnodes;
- int numvnodes;
- int freevnodes;
+ long numvnodes;
+ long freevnodes;
long numdirtybuffers;
} s, s1, s2, z;
OpenPOWER on IntegriCloud