Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next

[sfrench/cifs-2.6.git] / kernel / cgroup.c

diff --git a/kernel/cgroup.c b/kernel/cgroup.c
index 75c0ff00aca60d298062755539e83cbfeaffaaf2..9624db80dc4e485c9c3c3f3911141b343bcd0526 100644 (file)
--- a/kernel/cgroup.c
+++ b/kernel/cgroup.c
@@ -61,7 +61,7 @@
 #include <linux/cpuset.h>
 #include <linux/proc_ns.h>
 #include <linux/nsproxy.h>
-#include <linux/proc_ns.h>
+#include <linux/file.h>
 #include <net/sock.h>
 
 /*
@@ -1160,18 +1160,12 @@ static void cgroup_exit_root_id(struct cgroup_root *root)
 {
        lockdep_assert_held(&cgroup_mutex);
 
-       if (root->hierarchy_id) {
-               idr_remove(&cgroup_hierarchy_idr, root->hierarchy_id);
-               root->hierarchy_id = 0;
-       }
+       idr_remove(&cgroup_hierarchy_idr, root->hierarchy_id);
 }
 
 static void cgroup_free_root(struct cgroup_root *root)
 {
        if (root) {
-               /* hierarchy ID should already have been released */
-               WARN_ON_ONCE(root->hierarchy_id);
-
                idr_destroy(&root->cgroup_idr);
                kfree(root);
        }
@@ -5146,6 +5140,8 @@ static struct cgroup_subsys_state *css_create(struct cgroup *cgrp,
        lockdep_assert_held(&cgroup_mutex);
 
        css = ss->css_alloc(parent_css);
+       if (!css)
+               css = ERR_PTR(-ENOMEM);
        if (IS_ERR(css))
                return css;
 
@@ -6172,7 +6168,7 @@ struct cgroup_subsys_state *css_tryget_online_from_dir(struct dentry *dentry,
 struct cgroup_subsys_state *css_from_id(int id, struct cgroup_subsys *ss)
 {
        WARN_ON_ONCE(!rcu_read_lock_held());
-       return id > 0 ? idr_find(&ss->css_idr, id) : NULL;
+       return idr_find(&ss->css_idr, id);
 }
 
 /**
@@ -6209,6 +6205,40 @@ struct cgroup *cgroup_get_from_path(const char *path)
 }
 EXPORT_SYMBOL_GPL(cgroup_get_from_path);
 
+/**
+ * cgroup_get_from_fd - get a cgroup pointer from a fd
+ * @fd: fd obtained by open(cgroup2_dir)
+ *
+ * Find the cgroup from a fd which should be obtained
+ * by opening a cgroup directory.  Returns a pointer to the
+ * cgroup on success. ERR_PTR is returned if the cgroup
+ * cannot be found.
+ */
+struct cgroup *cgroup_get_from_fd(int fd)
+{
+       struct cgroup_subsys_state *css;
+       struct cgroup *cgrp;
+       struct file *f;
+
+       f = fget_raw(fd);
+       if (!f)
+               return ERR_PTR(-EBADF);
+
+       css = css_tryget_online_from_dir(f->f_path.dentry, NULL);
+       fput(f);
+       if (IS_ERR(css))
+               return ERR_CAST(css);
+
+       cgrp = css->cgroup;
+       if (!cgroup_on_dfl(cgrp)) {
+               cgroup_put(cgrp);
+               return ERR_PTR(-EBADF);
+       }
+
+       return cgrp;
+}
+EXPORT_SYMBOL_GPL(cgroup_get_from_fd);
+
 /*
  * sock->sk_cgrp_data handling.  For more info, see sock_cgroup_data
  * definition in cgroup-defs.h.