ia64/xen-unstable

changeset 16426:ae087a0fa2c9

acm: Fix an exit label.

Jump to a different error exit label if error occurs early in the
policy update process.

Signed-off-by: Stefan Berger <stefanb@us.ibm.com>
author Keir Fraser <keir.fraser@citrix.com>
date Thu Nov 22 17:44:51 2007 +0000 (2007-11-22)
parents d3041196ae69
children fd3f6d814f6d
files xen/xsm/acm/acm_policy.c
line diff
     1.1 --- a/xen/xsm/acm/acm_policy.c	Thu Nov 22 17:43:29 2007 +0000
     1.2 +++ b/xen/xsm/acm/acm_policy.c	Thu Nov 22 17:44:51 2007 +0000
     1.3 @@ -104,7 +104,7 @@ static int
     1.4      /* if ssidrefs are to be deleted, make sure no domain is using them */
     1.5      if ( deletions != NULL )
     1.6          if ( acm_check_deleted_ssidrefs(deletions, errors) )
     1.7 -            goto error_lock_free;
     1.8 +            goto error_lock_free_nossidchange;
     1.9  
    1.10      if ( (ssidchanges != NULL) && (ssidchanges->num_items > 0) )
    1.11          /* assign all running domains new ssidrefs as requested */
    1.12 @@ -169,6 +169,7 @@ error_lock_free:
    1.13      {
    1.14          acm_doms_restore_ssidref();
    1.15      }
    1.16 +error_lock_free_nossidchange:
    1.17      do_chwall_init_state_curr(NULL);
    1.18      write_unlock(&acm_bin_pol_rwlock);
    1.19