]> xenbits.xensource.com Git - people/liuw/libxenctrl-split/xen.git/commitdiff
slightly simplify SCHEDOP_remote_shutdown handling
authorJan Beulich <jbeulich@suse.com>
Thu, 18 Jun 2015 12:55:18 +0000 (14:55 +0200)
committerJan Beulich <jbeulich@suse.com>
Thu, 18 Jun 2015 12:55:18 +0000 (14:55 +0200)
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>
xen/common/schedule.c

index 3325ccdd274faca0f60f37f3fe60aac8e1488be7..ecf154557c1edf6b0e85169be111bb63f1b0ed1d 100644 (file)
@@ -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;
     }