2008-08-10 21:17:19

by Adrian Bunk

Subject: [2.6 patch] make cgroup_is_removed() static

cgroup_is_removed() can now become static.

Additionally, make it no longer "inline" but let gcc decide whether or
not to inline it.

Signed-off-by: Adrian Bunk <[email protected]>

---
8e37a5ecc6f51b3904d5be693c16324bad6923c5
diff --git a/include/linux/cgroup.h b/include/linux/cgroup.h
index c98dd7c..f5df0ae 100644
--- a/include/linux/cgroup.h
+++ b/include/linux/cgroup.h
@@ -295,8 +295,6 @@ int cgroup_add_files(struct cgroup *cgrp,
const struct cftype cft[],
int count);

-int cgroup_is_removed(const struct cgroup *cgrp);
-
int cgroup_path(const struct cgroup *cgrp, char *buf, int buflen);

int cgroup_task_count(const struct cgroup *cgrp);
diff --git a/kernel/cgroup.c b/kernel/cgroup.c
index 13932ab..e6d6d40 100644
--- a/kernel/cgroup.c
+++ b/kernel/cgroup.c
@@ -119,7 +119,7 @@ static int need_forkexit_callback __read_mostly;
static int need_mm_owner_callback __read_mostly;

/* convenient tests for these bits */
-inline int cgroup_is_removed(const struct cgroup *cgrp)
+static int cgroup_is_removed(const struct cgroup *cgrp)
{
return test_bit(CGRP_REMOVED, &cgrp->flags);
}

2008-08-11 08:56:41

by Paul Menage

Subject: Re: [2.6 patch] make cgroup_is_removed() static

On Sun, Aug 10, 2008 at 2:15 PM, Adrian Bunk <[email protected]> wrote:
> cgroup_is_removed() can now become static.
>
> Additionally, make it no longer "inline" but let gcc decide whether or
> not to inline it.
>
> Signed-off-by: Adrian Bunk <[email protected]>

Acked-by: Paul Menage <[email protected]>

It might become non-static again in some future changes that I'm
planning for the locking, but we can make that change if/when it
arises.

>
> ---
> 8e37a5ecc6f51b3904d5be693c16324bad6923c5
> diff --git a/include/linux/cgroup.h b/include/linux/cgroup.h
> index c98dd7c..f5df0ae 100644
> --- a/include/linux/cgroup.h
> +++ b/include/linux/cgroup.h
> @@ -295,8 +295,6 @@ int cgroup_add_files(struct cgroup *cgrp,
> const struct cftype cft[],
> int count);
>
> -int cgroup_is_removed(const struct cgroup *cgrp);
> -
> int cgroup_path(const struct cgroup *cgrp, char *buf, int buflen);
>
> int cgroup_task_count(const struct cgroup *cgrp);
> diff --git a/kernel/cgroup.c b/kernel/cgroup.c
> index 13932ab..e6d6d40 100644
> --- a/kernel/cgroup.c
> +++ b/kernel/cgroup.c
> @@ -119,7 +119,7 @@ static int need_forkexit_callback __read_mostly;
> static int need_mm_owner_callback __read_mostly;
>
> /* convenient tests for these bits */
> -inline int cgroup_is_removed(const struct cgroup *cgrp)
> +static int cgroup_is_removed(const struct cgroup *cgrp)
> {
> return test_bit(CGRP_REMOVED, &cgrp->flags);
> }
>
>