Commit e18f6318 authored by Paul Jackson's avatar Paul Jackson Committed by Linus Torvalds
Browse files

cgroup brace coding style fix 



Coding style fix - one line conditionals don't get braces.

Signed-off-by: default avatarPaul Jackson <pj@sgi.com>
Acked-by: default avatarPaul Menage <menage@google.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 3cdeed29

kernel/cgroup.c

+5 −10
Original line number Diff line number Diff line
@@ -1181,20 +1181,18 @@ static int attach_task(struct cgroup *cgrp, struct task_struct *tsk) 
	for_each_subsys(root, ss) {

		if (ss->can_attach) {

			retval = ss->can_attach(ss, cgrp, tsk);

			if (retval) {

			if (retval)

				return retval;

		}

	}

	}



	/*

	 * Locate or allocate a new css_set for this task,

	 * based on its final set of cgroups

	 */

	newcg = find_css_set(cg, cgrp);

	if (!newcg) {

	if (!newcg)

		return -ENOMEM;

	}



	task_lock(tsk);

	if (tsk->flags & PF_EXITING) {
@@ -1214,10 +1212,9 @@ static int attach_task(struct cgroup *cgrp, struct task_struct *tsk) 
	write_unlock(&css_set_lock);



	for_each_subsys(root, ss) {

		if (ss->attach) {

		if (ss->attach)

			ss->attach(ss, cgrp, oldcgrp, tsk);

	}

	}

	set_bit(CGRP_RELEASABLE, &oldcgrp->flags);

	synchronize_rcu();

	put_css_set(cg);
@@ -1352,9 +1349,8 @@ static ssize_t cgroup_common_file_write(struct cgroup *cgrp, 
	{

		struct cgroupfs_root *root = cgrp->root;

		/* Strip trailing newline */

		if (nbytes && (buffer[nbytes-1] == '\n')) {

		if (nbytes && (buffer[nbytes-1] == '\n'))

			buffer[nbytes-1] = 0;

		}



		/* We never write anything other than '\0'

		 * into the last char of release_agent_path,
@@ -2124,10 +2120,9 @@ static inline int cgroup_has_css_refs(struct cgroup *cgrp) 
		 * matter, since it can only happen if the cgroup

		 * has been deleted and hence no longer needs the

		 * release agent to be called anyway. */

		if (css && atomic_read(&css->refcnt)) {

		if (css && atomic_read(&css->refcnt))

			return 1;

	}

	}

	return 0;

}