|
@@ -117,6 +117,9 @@ struct cfent {
|
|
|
struct list_head node;
|
|
|
struct dentry *dentry;
|
|
|
struct cftype *type;
|
|
|
+
|
|
|
+ /* file xattrs */
|
|
|
+ struct simple_xattrs xattrs;
|
|
|
};
|
|
|
|
|
|
/*
|
|
@@ -882,13 +885,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;
|
|
|
- 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);
|
|
|
+ simple_xattrs_free(&cfe->xattrs);
|
|
|
kfree(cfe);
|
|
|
- simple_xattrs_free(&cft->xattrs);
|
|
|
}
|
|
|
iput(inode);
|
|
|
}
|
|
@@ -2501,7 +2503,7 @@ static struct simple_xattrs *__d_xattrs(struct dentry *dentry)
|
|
|
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)
|
|
@@ -2677,8 +2679,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 };
|
|
|
|
|
|
- simple_xattrs_init(&cft->xattrs);
|
|
|
-
|
|
|
if (subsys && !(cgrp->root->flags & CGRP_ROOT_NOPREFIX)) {
|
|
|
strcpy(name, subsys->name);
|
|
|
strcat(name, ".");
|
|
@@ -2703,6 +2703,7 @@ static int cgroup_add_file(struct cgroup *cgrp, struct cgroup_subsys *subsys,
|
|
|
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;
|
|
|
}
|