From: Jan Beulich <jbeulich@suse.com>
Date: Thu, 18 Jun 2015 12:55:18 +0000 (+0200)
Subject: slightly simplify SCHEDOP_remote_shutdown handling
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~3074
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=d89d78912179fb6591f43abff879f43e37ba4654;p=xen.git

slightly simplify SCHEDOP_remote_shutdown handling

There's no need for two exit paths each using rcu_unlock_domain() on
its own here.

Signed-off-by: Jan Beulich <jbeulich@suse.com>
Reviewed-by: Andrew Cooper <andrew.cooper3@citrix.com>
Acked-by: George Dunlap <george.dunlap@eu.citrix.com>
---

diff --git a/xen/common/schedule.c b/xen/common/schedule.c
index 3325ccdd27..ecf154557c 100644
--- a/xen/common/schedule.c
+++ b/xen/common/schedule.c
@@ -970,16 +970,10 @@ ret_t do_sched_op(int cmd, XEN_GUEST_HANDLE_PARAM(void) arg)
             break;
 
         ret = xsm_schedop_shutdown(XSM_DM_PRIV, current->domain, d);
-        if ( ret )
-        {
-            rcu_unlock_domain(d);
-            return ret;
-        }
-
-        domain_shutdown(d, (u8)sched_remote_shutdown.reason);
+        if ( likely(!ret) )
+            domain_shutdown(d, sched_remote_shutdown.reason);
 
         rcu_unlock_domain(d);
-        ret = 0;
 
         break;
     }