summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordt <dt@FreeBSD.org>1999-02-14 21:42:05 +0000
committerdt <dt@FreeBSD.org>1999-02-14 21:42:05 +0000
commit9fb901914133e441f1b41cb33cbe60ae6c24a7cf (patch)
tree23d5f56dd34b16b2f081fda83d700cd2e547f070
parent607d5f3ccf8149c9778a6918acd08cc44d0147c7 (diff)
downloadFreeBSD-src-9fb901914133e441f1b41cb33cbe60ae6c24a7cf.zip
FreeBSD-src-9fb901914133e441f1b41cb33cbe60ae6c24a7cf.tar.gz
From rev. 1.12 of usr.sbin/pstat/pstat.c by phk:
Reflect the fact that we do not swap on the first <dmmax> blocks of a swapdev, to protect disklabels and other such magic stuff.
-rw-r--r--lib/libkvm/kvm_getswapinfo.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/lib/libkvm/kvm_getswapinfo.c b/lib/libkvm/kvm_getswapinfo.c
index 596e6bc..f0f1967 100644
--- a/lib/libkvm/kvm_getswapinfo.c
+++ b/lib/libkvm/kvm_getswapinfo.c
@@ -14,7 +14,7 @@ static const char copyright[] =
#ifndef lint
static const char rcsid[] =
- "$Id: kvm_getswapinfo.c,v 1.4 1999/01/27 11:29:15 bde Exp $";
+ "$Id: kvm_getswapinfo.c,v 1.5 1999/02/06 06:31:57 dillon Exp $";
#endif /* not lint */
#include <sys/param.h>
@@ -175,12 +175,15 @@ kvm_getswapinfo(
*
* new style: swinfo in DEV_BSIZE'd chunks but dmmax
* in pages.
+ *
+ * The first dmmax is never allocating to avoid
+ * trashing the disklabels
*/
if (type == 1)
- ttl = dbtoc(swinfo.sw_nblks);
+ ttl = dbtoc(swinfo.sw_nblks - dmmax);
else
- ttl = swinfo.sw_nblks;
+ ttl = swinfo.sw_nblks - dmmax;
if (ttl == 0)
continue;
OpenPOWER on IntegriCloud