[Devel,RHEL7,COMMIT] Revert "ve/sysfs: make dev/char/ directory tagged with VE tag"

Submitted by Konstantin Khorenko on Sept. 15, 2017, 10:26 a.m.


Message ID 201709151026.v8FAQg0n027286@finist_ce7.work
State New
Series "sysfs: don't use VE namespace for "dev/char" directory"
Headers show

Commit Message

Konstantin Khorenko Sept. 15, 2017, 10:26 a.m.
The commit is pushed to "branch-rh7-3.10.0-514.26.1.vz7.35.x-ovz" and will appear at https://src.openvz.org/scm/ovz/vzkernel.git
after rh7-3.10.0-514.26.1.vz7.35.8
commit eee9028d38715934a3b4cefa442be92feaeb8b28
Author: Konstantin Khorenko <khorenko@virtuozzo.com>
Date:   Fri Sep 15 13:20:33 2017 +0300

    Revert "ve/sysfs: make dev/char/ directory tagged with VE tag"
    This reverts commit c6c3f8f70a83de010a722f4ffcd876eac51cd676.
    sysfs: don't use VE namespace for "dev/char" directory
    Looks like we don't have devices, using it. Or lost some patches.
    Anyway, currently it doesn't work. To make this VE namespace work, "namespace"
    callback has to be added to ve_kobj_type. And this callback has to get VE
    structure from kobject somehow. IOW, device has to be allocated per-ve.
    Another issue here is that it's unclear, how to mark generic devices as
    allocated in VE#0 thus making them visible in VE#0.
    Looks like the whole idea was wrong...
    Signed-off-by: Stanislav Kinsburskiy <skinsbursky@virtuozzo.com>
    Reviewed-by: Kirill Tkhai <ktkhai@virtuozzo.com>
    khorenko@: other patches of that patchset are to be reviewed as well
    in the scope of https://jira.sw.ru/browse/PSBM-72008
    c6c3f8f ve/sysfs: make dev/char/ directory tagged with VE tag
    77494f1 ve/sysfs: allow symlinks between tagged and generic directories
    6fc34bb ve/kobject: new type for VE-aware object introduced
    fb49c37 ve/kobject: introduce new namespace tag and operations for VE
 drivers/base/core.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

Patch hide | download patch | download mbox

diff --git a/drivers/base/core.c b/drivers/base/core.c
index 80cf3eb..da37485 100644
--- a/drivers/base/core.c
+++ b/drivers/base/core.c
@@ -27,7 +27,6 @@ 
 #include <linux/async.h>
 #include <linux/pm_runtime.h>
 #include <linux/netdevice.h>
-#include <linux/ve.h>
 #include "base.h"
 #include "power/power.h"
@@ -1538,7 +1537,7 @@  int __init devices_init(void)
 	sysfs_dev_block_kobj = kobject_create_and_add("block", dev_kobj);
 	if (!sysfs_dev_block_kobj)
 		goto block_kobj_err;
-	sysfs_dev_char_kobj = kobject_create_and_add_ve("char", dev_kobj);
+	sysfs_dev_char_kobj = kobject_create_and_add("char", dev_kobj);
 	if (!sysfs_dev_char_kobj)
 		goto char_kobj_err;