[patch] Patch to functionally revert df33ecdd -r1

0000-revert-df33ecdd.patch (text/plain), 2.52 KB, created by eroen on 2013-01-14 01:13:16 UTC

revert df33ecdd

From: eroen <[e-mail]>

mount fuse's meminfo file to container's /proc/meminfo

we already have virtualize meminfo for container through fuse filesystem,
add function lxcContainerMountProcFuse to mount this meminfo file to
the container's /proc/meminfo.

So we can isolate container's /proc/meminfo from host now.

Signed-off-by: Gao feng <[e-mail]>
---
 src/lxc/lxc_container.c |   38 --------------------------------------
 1 file changed, 38 deletions(-)

diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c
index 3014564..8e2e3ec 100644
--- a/src/lxc/lxc_container.c
+++ b/src/lxc/lxc_container.c
@@ -595,36 +595,6 @@ cleanup:
     return rc;
 }
 
-#if HAVE_FUSE
-static int lxcContainerMountProcFuse(virDomainDefPtr def,
-                                     const char *srcprefix)
-{
-    int ret;
-    char *meminfo_path = NULL;
-
-    if ((ret = virAsprintf(&meminfo_path,
-                           "%s/%s/%s/meminfo",
-                           srcprefix, LXC_STATE_DIR,
-                           def->name)) < 0)
-        return ret;
-
-    if ((ret = mount(meminfo_path, "/proc/meminfo",
-                     NULL, MS_BIND, NULL)) < 0) {
-        virReportSystemError(errno,
-                             _("Failed to mount %s on /proc/meminfo"),
-                             meminfo_path);
-    }
-
-    VIR_FREE(meminfo_path);
-    return ret;
-}
-#else
-static int lxcContainerMountProcFuse(virDomainDefPtr def ATTRIBUTE_UNUSED,
-                                     const char *srcprefix ATTRIBUTE_UNUSED)
-{
-    return 0;
-}
-#endif
 
 static int lxcContainerMountFSDevPTS(virDomainFSDefPtr root)
 {
@@ -1584,10 +1554,6 @@ static int lxcContainerSetupPivotRoot(virDomainDefPtr vmDef,
     if (lxcContainerMountBasicFS(true, sec_mount_options) < 0)
         goto cleanup;
 
-    /* Mounts /proc/meminfo etc sysinfo */
-    if (lxcContainerMountProcFuse(vmDef, "/.oldroot") < 0)
-        goto cleanup;
-
     /* Now we can re-mount the cgroups controllers in the
      * same configuration as before */
     if (lxcContainerMountCGroups(mounts, nmounts,
@@ -1684,10 +1650,6 @@ static int lxcContainerSetupExtraMounts(virDomainDefPtr vmDef,
     if (lxcContainerMountBasicFS(false, sec_mount_options) < 0)
         goto cleanup;
 
-    /* Mounts /proc/meminfo etc sysinfo */
-    if (lxcContainerMountProcFuse(vmDef, "/.oldroot") < 0)
-        goto cleanup;
-
     /* Now we can re-mount the cgroups controllers in the
      * same configuration as before */
     if (lxcContainerMountCGroups(mounts, nmounts,