Merge branch 'p-ti-linux-3.8.y' into p-ti-android-3.8.y

[android-sdk/kernel-video.git] / kernel / cgroup.c

diff --git a/kernel/cgroup.c b/kernel/cgroup.c
index 21762fc354fbcd14c3fba6abbfa0dc51f649de25..f28c151d30cabe4d32855d1393cafc9f52c12f3c 100644 (file)
--- a/kernel/cgroup.c
+++ b/kernel/cgroup.c
@@ -162,6 +162,9 @@ struct cfent {
        struct list_head                node;
        struct dentry                   *dentry;
        struct cftype                   *type;
        struct list_head                node;
        struct dentry                   *dentry;
        struct cftype                   *type;

+
+       /* file xattrs */
+       struct simple_xattrs            xattrs;

 };
 
 /*
 };
 
 /*


@@ -908,13 +911,12 @@ static void cgroup_diput(struct dentry *dentry, struct inode *inode)
        } else {
                struct cfent *cfe = __d_cfe(dentry);
                struct cgroup *cgrp = dentry->d_parent->d_fsdata;
        } else {
                struct cfent *cfe = __d_cfe(dentry);
                struct cgroup *cgrp = dentry->d_parent->d_fsdata;

-               struct cftype *cft = cfe->type;

 
                WARN_ONCE(!list_empty(&cfe->node) &&
                          cgrp != &cgrp->root->top_cgroup,
                          "cfe still linked for %s\n", cfe->type->name);
 
                WARN_ONCE(!list_empty(&cfe->node) &&
                          cgrp != &cgrp->root->top_cgroup,
                          "cfe still linked for %s\n", cfe->type->name);

+               simple_xattrs_free(&cfe->xattrs);

                kfree(cfe);
                kfree(cfe);

-               simple_xattrs_free(&cft->xattrs);

        }
        iput(inode);
 }
        }
        iput(inode);
 }


@@ -2066,7 +2068,7 @@ static int cgroup_attach_proc(struct cgroup *cgrp, struct task_struct *leader)
        if (!group)
                return -ENOMEM;
        /* pre-allocate to guarantee space while iterating in rcu read-side. */
        if (!group)
                return -ENOMEM;
        /* pre-allocate to guarantee space while iterating in rcu read-side. */

-       retval = flex_array_prealloc(group, 0, group_size - 1, GFP_KERNEL);
+       retval = flex_array_prealloc(group, 0, group_size, GFP_KERNEL);

        if (retval)
                goto out_free_group_list;
 
        if (retval)
                goto out_free_group_list;
 


@@ -2580,7 +2582,7 @@ static struct simple_xattrs *__d_xattrs(struct dentry *dentry)
        if (S_ISDIR(dentry->d_inode->i_mode))
                return &__d_cgrp(dentry)->xattrs;
        else
        if (S_ISDIR(dentry->d_inode->i_mode))
                return &__d_cgrp(dentry)->xattrs;
        else

-               return &__d_cft(dentry)->xattrs;
+               return &__d_cfe(dentry)->xattrs;

 }
 
 static inline int xattr_enabled(struct dentry *dentry)
 }
 
 static inline int xattr_enabled(struct dentry *dentry)


@@ -2756,8 +2758,6 @@ static int cgroup_add_file(struct cgroup *cgrp, struct cgroup_subsys *subsys,
        umode_t mode;
        char name[MAX_CGROUP_TYPE_NAMELEN + MAX_CFTYPE_NAME + 2] = { 0 };
 
        umode_t mode;
        char name[MAX_CGROUP_TYPE_NAMELEN + MAX_CFTYPE_NAME + 2] = { 0 };
 

-       simple_xattrs_init(&cft->xattrs);
-

        if (subsys && !test_bit(ROOT_NOPREFIX, &cgrp->root->flags)) {
                strcpy(name, subsys->name);
                strcat(name, ".");
        if (subsys && !test_bit(ROOT_NOPREFIX, &cgrp->root->flags)) {
                strcpy(name, subsys->name);
                strcat(name, ".");


@@ -2782,6 +2782,7 @@ static int cgroup_add_file(struct cgroup *cgrp, struct cgroup_subsys *subsys,
                cfe->type = (void *)cft;
                cfe->dentry = dentry;
                dentry->d_fsdata = cfe;
                cfe->type = (void *)cft;
                cfe->dentry = dentry;
                dentry->d_fsdata = cfe;

+               simple_xattrs_init(&cfe->xattrs);

                list_add_tail(&cfe->node, &parent->files);
                cfe = NULL;
        }
                list_add_tail(&cfe->node, &parent->files);
                cfe = NULL;
        }