diff mbox

[4/4] lxc: fuse: Stub out Slab bits in /proc/meminfo

Message ID 382b7d1f76f1afc177d7fbebfc9714f2bbcc3ec2.1453401727.git.crobinso@redhat.com
State Accepted
Commit 81da8bc73b6bc6777632b65a0df45335f7caebe4
Headers show

Commit Message

Cole Robinson Jan. 21, 2016, 6:43 p.m. UTC 
'free' on fedora23 wants to use the Slab field for calculated used
memory. The equation is:

used = MemTotal - MemFree - (Cached + Slab) - Buffers

We already set Cached and Buffers to 0, do the same for Slab and its
related values

https://bugzilla.redhat.com/show_bug.cgi?id=1300781
---
 src/lxc/lxc_fuse.c | 6 ++++++
 1 file changed, 6 insertions(+)

-- 
2.5.0

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
diff mbox

Patch

diff --git a/src/lxc/lxc_fuse.c b/src/lxc/lxc_fuse.c
index 0a1c7dc..1988c19 100644
--- a/src/lxc/lxc_fuse.c
+++ b/src/lxc/lxc_fuse.c
@@ -217,6 +217,12 @@  static int lxcProcReadMeminfo(char *hostpath, virDomainDefPtr def,
             virBufferAsprintf(new_meminfo, "SwapFree:       %8llu kB\n",
                               (meminfo.swaptotal - meminfo.memtotal -
                                meminfo.swapusage + meminfo.memusage));
+        } else if (STREQ(line, "Slab")) {
+            virBufferAsprintf(new_meminfo, "Slab:           %8d kB\n", 0);
+        } else if (STREQ(line, "SReclaimable")) {
+            virBufferAsprintf(new_meminfo, "SReclaimable:   %8d kB\n", 0);
+        } else if (STREQ(line, "SUnreclaim")) {
+            virBufferAsprintf(new_meminfo, "SUnreclaim:     %8d kB\n", 0);
         } else {
             *ptr = ':';
             virBufferAdd(new_meminfo, line, -1);