Merge tag 'iommu-fixes-v3.19-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git...

[firefly-linux-kernel-4.4.55.git] / kernel / utsname.c

diff --git a/kernel/utsname.c b/kernel/utsname.c
index 20697befe46632fd2d08fa7df1273b0b905f588e..831ea71082320e1859daa1f434008816c3052333 100644 (file)
--- a/kernel/utsname.c
+++ b/kernel/utsname.c
@@ -42,12 +42,14 @@ static struct uts_namespace *clone_uts_ns(struct user_namespace *user_ns,
        if (!ns)
                return ERR_PTR(-ENOMEM);
 
-       err = proc_alloc_inum(&ns->ns.inum);
+       err = ns_alloc_inum(&ns->ns);
        if (err) {
                kfree(ns);
                return ERR_PTR(err);
        }
 
+       ns->ns.ops = &utsns_operations;
+
        down_read(&uts_sem);
        memcpy(&ns->name, &old_ns->name, sizeof(ns->name));
        ns->user_ns = get_user_ns(user_ns);
@@ -84,7 +86,7 @@ void free_uts_ns(struct kref *kref)
 
        ns = container_of(kref, struct uts_namespace, kref);
        put_user_ns(ns->user_ns);
-       proc_free_inum(ns->ns.inum);
+       ns_free_inum(&ns->ns);
        kfree(ns);
 }