Enumerate processes for kernels without memory cgroups and the stat API.
authorDaniel Hokka Zakrisson <daniel@hozac.com>
Thu, 28 Oct 2010 13:52:13 +0000 (13:52 +0000)
committerDaniel Hokka Zakrisson <daniel@hozac.com>
Thu, 28 Oct 2010 13:52:13 +0000 (13:52 +0000)
git-svn-id: http://svn.linux-vserver.org/svn/util-vserver/trunk@2917 94cd875c-1c1d-0410-91d2-eb244daf1a30

lib/issupported.c
src/vserver-stat.c

index cb7bcba..e1176de 100644 (file)
@@ -46,7 +46,7 @@ vc_isSupported(vcFeatureSet feature)
     case vcFEATURE_SCHED       :  return ver >= 0x00020000;  // todo
     case vcFEATURE_VNET                :  return ver >= 0x00020001;
     case vcFEATURE_PERSISTENT  :  return ver >= 0x00020002;
-    case vcFEATURE_VSTAT       :  return ver >= 0x00020103;
+    case vcFEATURE_VSTAT       :  return ver >= 0x00020103 && ver < 0x00020306;
     case vcFEATURE_PPTAG       :  return conf & VC_VCI_PPTAG;
     case vcFEATURE_SPACES      :  return conf & VC_VCI_SPACES;
     case vcFEATURE_PIVOT_ROOT  :  return ver >= 0x00020304;
index 4b298f1..dee9d77 100644 (file)
@@ -762,7 +762,7 @@ int main(int argc, char **argv)
   
   Vector_init(&xid_data, sizeof(struct XidData));
 
-  if (vc_isSupported(vcFEATURE_VSTAT) && !vc_isSupported(vcFEATURE_MEMCG)) {
+  if (vc_isSupported(vcFEATURE_VSTAT)) {
     unsigned long xid;
     Echdir(PROC_VIRT_DIR_NAME);
     proc_dir = Eopendir(".");