[PATCH] tmem: Drop a gross goto usage.

[PATCH] tmem: Drop a gross goto usage.

[Konrad Rzeszutek Wilk]

No need to do it that way.

Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
---
 xen/common/tmem.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/xen/common/tmem.c b/xen/common/tmem.c
index bcf9bbf..9868fe3 100644
--- a/xen/common/tmem.c
+++ b/xen/common/tmem.c
@@ -2597,17 +2597,15 @@ long do_tmem_op(tmem_cli_op_t uops)
 
     if ( client != NULL && client->domain->is_dying )
     {
-        rc = -ENODEV;
- simple_error:
         errored_tmem_ops++;
-        return rc;
+        return -ENODEV;
     }
 
     if ( unlikely(tmem_get_tmemop_from_client(&op, uops) != 0) )
     {
         tmem_client_err("tmem: can't get tmem struct from %s\n", tmem_client_str);
-        rc = -EFAULT;
-        goto simple_error;
+        errored_tmem_ops++;
+        return -EFAULT;
     }
 
     /* Acquire wirte lock for all command at first */
-- 
1.8.5.3

Re: [PATCH] tmem: Drop a gross goto usage.

[Jan Beulich]

>>> On 05.03.14 at 22:51, Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> wrote:
> No need to do it that way.
> 
> Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>

I applied it, but it would have been nice if you had mentioned
that this wasn't against current staging (i.e. didn't apply without
fuzz).

Jan

Re: [PATCH] tmem: Drop a gross goto usage.

[Konrad Rzeszutek Wilk]

On Mar 6, 2014 6:25 AM, Jan Beulich <JBeulich@suse.com> wrote:
>
> >>> On 05.03.14 at 22:51, Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> wrote: 
> > No need to do it that way. 
> > 
> > Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> 
>
> I applied it, but it would have been nice if you had mentioned 
> that this wasn't against current staging (i.e. didn't apply without 
> fuzz).

Pardon me. I was basing it on top of the patches that Bob had posted - as I was reviewing them and saw this and figured I might as well post it for a second look.

Thanks for checking it in!
>
> Jan 
>