* [PATCH 2/2] pidns 2/2: rewrite copy_pid_ns()
@ 2009-05-03 23:27 ` Alexey Dobriyan
0 siblings, 0 replies; 6+ messages in thread
From: Alexey Dobriyan @ 2009-05-03 23:27 UTC (permalink / raw)
To: akpm-de/tnXTf+JLsfHDXvbKv3WD2FQJk+8+b
Cc: containers-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA,
linux-kernel-u79uwXL29TY76Z2rM5mHXA, xemul-bzQdu9zFT3WakBO8gow8eQ
copy_pid_ns() is a perfect example of a case where unwinding leads to more
code and makes it less clear. Watch the diffstat.
Signed-off-by: Alexey Dobriyan <adobriyan-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
---
kernel/pid_namespace.c | 18 +++---------------
1 files changed, 3 insertions(+), 15 deletions(-)
diff --git a/kernel/pid_namespace.c b/kernel/pid_namespace.c
index 495d5de..821722a 100644
--- a/kernel/pid_namespace.c
+++ b/kernel/pid_namespace.c
@@ -116,23 +116,11 @@ static void destroy_pid_namespace(struct pid_namespace *ns)
struct pid_namespace *copy_pid_ns(unsigned long flags, struct pid_namespace *old_ns)
{
- struct pid_namespace *new_ns;
-
- BUG_ON(!old_ns);
- new_ns = get_pid_ns(old_ns);
if (!(flags & CLONE_NEWPID))
- goto out;
-
- new_ns = ERR_PTR(-EINVAL);
+ return get_pid_ns(old_ns);
if (flags & CLONE_THREAD)
- goto out_put;
-
- new_ns = create_pid_namespace(old_ns);
-
-out_put:
- put_pid_ns(old_ns);
-out:
- return new_ns;
+ return ERR_PTR(-EINVAL);
+ return create_pid_namespace(old_ns);
}
void free_pid_ns(struct kref *kref)
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 2/2] pidns 2/2: rewrite copy_pid_ns()
@ 2009-05-03 23:27 ` Alexey Dobriyan
0 siblings, 0 replies; 6+ messages in thread
From: Alexey Dobriyan @ 2009-05-03 23:27 UTC (permalink / raw)
To: akpm; +Cc: linux-kernel, containers, xemul
copy_pid_ns() is a perfect example of a case where unwinding leads to more
code and makes it less clear. Watch the diffstat.
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
---
kernel/pid_namespace.c | 18 +++---------------
1 files changed, 3 insertions(+), 15 deletions(-)
diff --git a/kernel/pid_namespace.c b/kernel/pid_namespace.c
index 495d5de..821722a 100644
--- a/kernel/pid_namespace.c
+++ b/kernel/pid_namespace.c
@@ -116,23 +116,11 @@ static void destroy_pid_namespace(struct pid_namespace *ns)
struct pid_namespace *copy_pid_ns(unsigned long flags, struct pid_namespace *old_ns)
{
- struct pid_namespace *new_ns;
-
- BUG_ON(!old_ns);
- new_ns = get_pid_ns(old_ns);
if (!(flags & CLONE_NEWPID))
- goto out;
-
- new_ns = ERR_PTR(-EINVAL);
+ return get_pid_ns(old_ns);
if (flags & CLONE_THREAD)
- goto out_put;
-
- new_ns = create_pid_namespace(old_ns);
-
-out_put:
- put_pid_ns(old_ns);
-out:
- return new_ns;
+ return ERR_PTR(-EINVAL);
+ return create_pid_namespace(old_ns);
}
void free_pid_ns(struct kref *kref)
^ permalink raw reply related [flat|nested] 6+ messages in thread[parent not found: <20090503232721.GE16631-2ev+ksY9ol182hYKe6nXyg@public.gmane.org>]
* Re: [PATCH 2/2] pidns 2/2: rewrite copy_pid_ns()
[not found] ` <20090503232721.GE16631-2ev+ksY9ol182hYKe6nXyg@public.gmane.org>
@ 2009-05-05 1:59 ` Sukadev Bhattiprolu
2009-05-08 19:19 ` Serge E. Hallyn
1 sibling, 0 replies; 6+ messages in thread
From: Sukadev Bhattiprolu @ 2009-05-05 1:59 UTC (permalink / raw)
To: Alexey Dobriyan
Cc: containers-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA,
akpm-de/tnXTf+JLsfHDXvbKv3WD2FQJk+8+b,
linux-kernel-u79uwXL29TY76Z2rM5mHXA, xemul-bzQdu9zFT3WakBO8gow8eQ
Alexey Dobriyan [adobriyan-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org] wrote:
| copy_pid_ns() is a perfect example of a case where unwinding leads to more
| code and makes it less clear. Watch the diffstat.
Yes, its cleaner this way :-)
|
| Signed-off-by: Alexey Dobriyan <adobriyan-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
Acked-by: Sukadev Bhattiprolu <sukadev-23VcF4HTsmIX0ybBhKVfKdBPR1lH4CV8@public.gmane.org>
| ---
| kernel/pid_namespace.c | 18 +++---------------
| 1 files changed, 3 insertions(+), 15 deletions(-)
|
| diff --git a/kernel/pid_namespace.c b/kernel/pid_namespace.c
| index 495d5de..821722a 100644
| --- a/kernel/pid_namespace.c
| +++ b/kernel/pid_namespace.c
| @@ -116,23 +116,11 @@ static void destroy_pid_namespace(struct pid_namespace *ns)
|
| struct pid_namespace *copy_pid_ns(unsigned long flags, struct pid_namespace *old_ns)
| {
| - struct pid_namespace *new_ns;
| -
| - BUG_ON(!old_ns);
| - new_ns = get_pid_ns(old_ns);
| if (!(flags & CLONE_NEWPID))
| - goto out;
| -
| - new_ns = ERR_PTR(-EINVAL);
| + return get_pid_ns(old_ns);
| if (flags & CLONE_THREAD)
| - goto out_put;
| -
| - new_ns = create_pid_namespace(old_ns);
| -
| -out_put:
| - put_pid_ns(old_ns);
| -out:
| - return new_ns;
| + return ERR_PTR(-EINVAL);
| + return create_pid_namespace(old_ns);
| }
|
| void free_pid_ns(struct kref *kref)
| --
| To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
| the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
| More majordomo info at http://vger.kernel.org/majordomo-info.html
| Please read the FAQ at http://www.tux.org/lkml/
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH 2/2] pidns 2/2: rewrite copy_pid_ns()
[not found] ` <20090503232721.GE16631-2ev+ksY9ol182hYKe6nXyg@public.gmane.org>
2009-05-05 1:59 ` Sukadev Bhattiprolu
@ 2009-05-08 19:19 ` Serge E. Hallyn
1 sibling, 0 replies; 6+ messages in thread
From: Serge E. Hallyn @ 2009-05-08 19:19 UTC (permalink / raw)
To: Alexey Dobriyan
Cc: akpm-de/tnXTf+JLsfHDXvbKv3WD2FQJk+8+b,
xemul-bzQdu9zFT3WakBO8gow8eQ,
containers-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA,
linux-kernel-u79uwXL29TY76Z2rM5mHXA
Quoting Alexey Dobriyan (adobriyan-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org):
> copy_pid_ns() is a perfect example of a case where unwinding leads to more
> code and makes it less clear. Watch the diffstat.
>
> Signed-off-by: Alexey Dobriyan <adobriyan-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
Nice.
Reviewed-by: Serge Hallyn <serue-r/Jw6+rmf7HQT0dZR+AlfA@public.gmane.org>
thanks,
-serge
> ---
> kernel/pid_namespace.c | 18 +++---------------
> 1 files changed, 3 insertions(+), 15 deletions(-)
>
> diff --git a/kernel/pid_namespace.c b/kernel/pid_namespace.c
> index 495d5de..821722a 100644
> --- a/kernel/pid_namespace.c
> +++ b/kernel/pid_namespace.c
> @@ -116,23 +116,11 @@ static void destroy_pid_namespace(struct pid_namespace *ns)
>
> struct pid_namespace *copy_pid_ns(unsigned long flags, struct pid_namespace *old_ns)
> {
> - struct pid_namespace *new_ns;
> -
> - BUG_ON(!old_ns);
> - new_ns = get_pid_ns(old_ns);
> if (!(flags & CLONE_NEWPID))
> - goto out;
> -
> - new_ns = ERR_PTR(-EINVAL);
> + return get_pid_ns(old_ns);
> if (flags & CLONE_THREAD)
> - goto out_put;
> -
> - new_ns = create_pid_namespace(old_ns);
> -
> -out_put:
> - put_pid_ns(old_ns);
> -out:
> - return new_ns;
> + return ERR_PTR(-EINVAL);
> + return create_pid_namespace(old_ns);
> }
>
> void free_pid_ns(struct kref *kref)
> _______________________________________________
> Containers mailing list
> Containers-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org
> https://lists.linux-foundation.org/mailman/listinfo/containers
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 2/2] pidns 2/2: rewrite copy_pid_ns()
2009-05-03 23:27 ` Alexey Dobriyan
(?)
(?)
@ 2009-05-05 1:59 ` Sukadev Bhattiprolu
-1 siblings, 0 replies; 6+ messages in thread
From: Sukadev Bhattiprolu @ 2009-05-05 1:59 UTC (permalink / raw)
To: Alexey Dobriyan; +Cc: akpm, linux-kernel, containers, xemul
Alexey Dobriyan [adobriyan@gmail.com] wrote:
| copy_pid_ns() is a perfect example of a case where unwinding leads to more
| code and makes it less clear. Watch the diffstat.
Yes, its cleaner this way :-)
|
| Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Acked-by: Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com>
| ---
| kernel/pid_namespace.c | 18 +++---------------
| 1 files changed, 3 insertions(+), 15 deletions(-)
|
| diff --git a/kernel/pid_namespace.c b/kernel/pid_namespace.c
| index 495d5de..821722a 100644
| --- a/kernel/pid_namespace.c
| +++ b/kernel/pid_namespace.c
| @@ -116,23 +116,11 @@ static void destroy_pid_namespace(struct pid_namespace *ns)
|
| struct pid_namespace *copy_pid_ns(unsigned long flags, struct pid_namespace *old_ns)
| {
| - struct pid_namespace *new_ns;
| -
| - BUG_ON(!old_ns);
| - new_ns = get_pid_ns(old_ns);
| if (!(flags & CLONE_NEWPID))
| - goto out;
| -
| - new_ns = ERR_PTR(-EINVAL);
| + return get_pid_ns(old_ns);
| if (flags & CLONE_THREAD)
| - goto out_put;
| -
| - new_ns = create_pid_namespace(old_ns);
| -
| -out_put:
| - put_pid_ns(old_ns);
| -out:
| - return new_ns;
| + return ERR_PTR(-EINVAL);
| + return create_pid_namespace(old_ns);
| }
|
| void free_pid_ns(struct kref *kref)
| --
| To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
| the body of a message to majordomo@vger.kernel.org
| More majordomo info at http://vger.kernel.org/majordomo-info.html
| Please read the FAQ at http://www.tux.org/lkml/
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH 2/2] pidns 2/2: rewrite copy_pid_ns()
2009-05-03 23:27 ` Alexey Dobriyan
` (2 preceding siblings ...)
(?)
@ 2009-05-08 19:19 ` Serge E. Hallyn
-1 siblings, 0 replies; 6+ messages in thread
From: Serge E. Hallyn @ 2009-05-08 19:19 UTC (permalink / raw)
To: Alexey Dobriyan; +Cc: akpm, containers, linux-kernel, xemul
Quoting Alexey Dobriyan (adobriyan@gmail.com):
> copy_pid_ns() is a perfect example of a case where unwinding leads to more
> code and makes it less clear. Watch the diffstat.
>
> Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Nice.
Reviewed-by: Serge Hallyn <serue@us.ibm.com>
thanks,
-serge
> ---
> kernel/pid_namespace.c | 18 +++---------------
> 1 files changed, 3 insertions(+), 15 deletions(-)
>
> diff --git a/kernel/pid_namespace.c b/kernel/pid_namespace.c
> index 495d5de..821722a 100644
> --- a/kernel/pid_namespace.c
> +++ b/kernel/pid_namespace.c
> @@ -116,23 +116,11 @@ static void destroy_pid_namespace(struct pid_namespace *ns)
>
> struct pid_namespace *copy_pid_ns(unsigned long flags, struct pid_namespace *old_ns)
> {
> - struct pid_namespace *new_ns;
> -
> - BUG_ON(!old_ns);
> - new_ns = get_pid_ns(old_ns);
> if (!(flags & CLONE_NEWPID))
> - goto out;
> -
> - new_ns = ERR_PTR(-EINVAL);
> + return get_pid_ns(old_ns);
> if (flags & CLONE_THREAD)
> - goto out_put;
> -
> - new_ns = create_pid_namespace(old_ns);
> -
> -out_put:
> - put_pid_ns(old_ns);
> -out:
> - return new_ns;
> + return ERR_PTR(-EINVAL);
> + return create_pid_namespace(old_ns);
> }
>
> void free_pid_ns(struct kref *kref)
> _______________________________________________
> Containers mailing list
> Containers@lists.linux-foundation.org
> https://lists.linux-foundation.org/mailman/listinfo/containers
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2009-05-08 19:20 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-05-03 23:27 [PATCH 2/2] pidns 2/2: rewrite copy_pid_ns() Alexey Dobriyan
2009-05-03 23:27 ` Alexey Dobriyan
[not found] ` <20090503232721.GE16631-2ev+ksY9ol182hYKe6nXyg@public.gmane.org>
2009-05-05 1:59 ` Sukadev Bhattiprolu
2009-05-08 19:19 ` Serge E. Hallyn
2009-05-05 1:59 ` Sukadev Bhattiprolu
2009-05-08 19:19 ` Serge E. Hallyn
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.