Add a new function swap_pager_status() which reports the total size of the

paging space and how much of it is in use (in pages).

Use this interface from the Linuxolator instead of groping around in the
internals of the swap_pager.

1 files changed, 4 insertions, 8 deletions

diff --git a/sys/compat/linux/linux_misc.c b/sys/compat/linux/linux_misc.c
index cf113ea..8ccc5cf 100644
--- a/sys/compat/linux/linux_misc.c
+++ b/sys/compat/linux/linux_misc.c
@@ -108,7 +108,7 @@ linux_sysinfo(struct thread *td, struct linux_sysinfo_args *args)
 {
 	struct l_sysinfo sysinfo;
 	vm_object_t object;
-	int i;
+	int i, j;
 	struct timespec ts;
 
 	/* Uptime is copied out of print_uptime() in kern_shutdown.c */
@@ -144,13 +144,9 @@ linux_sysinfo(struct thread *td, struct linux_sysinfo_args *args)
 	sysinfo.sharedram *= PAGE_SIZE;
 	sysinfo.bufferram = 0;
 
-	if (swapblist == NULL) {
-		sysinfo.totalswap= 0;
-		sysinfo.freeswap = 0;
-	} else {
-		sysinfo.totalswap = swapblist->bl_blocks * 1024;
-		sysinfo.freeswap = swapblist->bl_root->u.bmu_avail * PAGE_SIZE;
-	}
+	swap_pager_status(&i, &j);
+	sysinfo.totalswap= i * PAGE_SIZE;
+	sysinfo.freeswap = (i - j) * PAGE_SIZE;
 
 	sysinfo.procs = 20; /* Hack */