Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 93438629 authored by Tejun Heo's avatar Tejun Heo
Browse files

cgroup: convert cgroupfs_root flag bits to masks and add CGRP_ prefix 



There's no reason to be using bitops, which tends to be more
cumbersome, to handle root flags.  Convert them to masks.  Also, as
they'll be moved to include/linux/cgroup.h and it's generally a good
idea, add CGRP_ prefix.

Note that flags are assigned from (1 << 1).  The first bit will be
used by a flag which will be added soon.

Signed-off-by: default avatarTejun Heo <tj@kernel.org>
Acked-by: default avatarSerge E. Hallyn <serge.hallyn@ubuntu.com>
Acked-by: default avatarLi Zefan <lizefan@huawei.com>
parent da1f296f

kernel/cgroup.c

+10 −11
Original line number Diff line number Diff line
@@ -296,10 +296,10 @@ bool cgroup_is_descendant(struct cgroup *cgrp, struct cgroup *ancestor) 
}

EXPORT_SYMBOL_GPL(cgroup_is_descendant);



/* bits in struct cgroupfs_root flags field */

/* cgroupfs_root->flags */

enum {

	ROOT_NOPREFIX,	/* mounted subsystems have no named prefix */

	ROOT_XATTR,	/* supports extended attributes */

	CGRP_ROOT_NOPREFIX	= (1 << 1), /* mounted subsystems have no named prefix */

	CGRP_ROOT_XATTR		= (1 << 2), /* supports extended attributes */

};



static int cgroup_is_releasable(const struct cgroup *cgrp)
@@ -1137,9 +1137,9 @@ static int cgroup_show_options(struct seq_file *seq, struct dentry *dentry) 
	mutex_lock(&cgroup_root_mutex);

	for_each_subsys(root, ss)

		seq_printf(seq, ",%s", ss->name);

	if (test_bit(ROOT_NOPREFIX, &root->flags))

	if (root->flags & CGRP_ROOT_NOPREFIX)

		seq_puts(seq, ",noprefix");

	if (test_bit(ROOT_XATTR, &root->flags))

	if (root->flags & CGRP_ROOT_XATTR)

		seq_puts(seq, ",xattr");

	if (strlen(root->release_agent_path))

		seq_printf(seq, ",release_agent=%s", root->release_agent_path);
@@ -1202,7 +1202,7 @@ static int parse_cgroupfs_options(char *data, struct cgroup_sb_opts *opts) 
			continue;

		}

		if (!strcmp(token, "noprefix")) {

			set_bit(ROOT_NOPREFIX, &opts->flags);

			opts->flags |= CGRP_ROOT_NOPREFIX;

			continue;

		}

		if (!strcmp(token, "clone_children")) {
@@ -1210,7 +1210,7 @@ static int parse_cgroupfs_options(char *data, struct cgroup_sb_opts *opts) 
			continue;

		}

		if (!strcmp(token, "xattr")) {

			set_bit(ROOT_XATTR, &opts->flags);

			opts->flags |= CGRP_ROOT_XATTR;

			continue;

		}

		if (!strncmp(token, "release_agent=", 14)) {
@@ -1293,8 +1293,7 @@ static int parse_cgroupfs_options(char *data, struct cgroup_sb_opts *opts) 
	 * with the old cpuset, so we allow noprefix only if mounting just

	 * the cpuset subsystem.

	 */

	if (test_bit(ROOT_NOPREFIX, &opts->flags) &&

	    (opts->subsys_mask & mask))

	if ((opts->flags & CGRP_ROOT_NOPREFIX) && (opts->subsys_mask & mask))

		return -EINVAL;
@@ -2526,7 +2525,7 @@ static struct simple_xattrs *__d_xattrs(struct dentry *dentry) 
static inline int xattr_enabled(struct dentry *dentry)

{

	struct cgroupfs_root *root = dentry->d_sb->s_fs_info;

	return test_bit(ROOT_XATTR, &root->flags);

	return root->flags & CGRP_ROOT_XATTR;

}



static bool is_valid_xattr(const char *name)
@@ -2698,7 +2697,7 @@ static int cgroup_add_file(struct cgroup *cgrp, struct cgroup_subsys *subsys, 


	simple_xattrs_init(&cft->xattrs);



	if (subsys && !test_bit(ROOT_NOPREFIX, &cgrp->root->flags)) {

	if (subsys && !(cgrp->root->flags & CGRP_ROOT_NOPREFIX)) {

		strcpy(name, subsys->name);

		strcat(name, ".");

	}