From 24541d9896c3b9b982e2dd168c6ca0b43f73448b Mon Sep 17 00:00:00 2001 From: Janos Kovacs Date: Mon, 8 Oct 2012 00:46:56 +0300 Subject: [PATCH] resource: resource set state changes no-request => release when got installed --- src/resource/application-class.c | 4 ++++ src/resource/resource-owner.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/resource/application-class.c b/src/resource/application-class.c index a4b83cc..c7525fe 100644 --- a/src/resource/application-class.c +++ b/src/resource/application-class.c @@ -44,6 +44,7 @@ #include "application-class.h" #include "resource-set.h" +#include "resource-owner.h" #include "zone.h" #define CLASS_MAX 64 @@ -262,6 +263,9 @@ int mrp_application_class_add_resource_set(const char *class_name, rset->zone = mrp_zone_get_id(zone); rset->request.id = reqid; + if (rset->state == mrp_resource_no_request) + rset->state = mrp_resource_release; + mrp_application_class_move_resource_set(rset); mrp_resource_owner_update_zone(rset->zone, rset, reqid); diff --git a/src/resource/resource-owner.c b/src/resource/resource-owner.c index d6a2466..fd4ed6c 100644 --- a/src/resource/resource-owner.c +++ b/src/resource/resource-owner.c @@ -263,7 +263,7 @@ void mrp_resource_owner_update_zone(uint32_t zoneid, if (advice_ownership(owner, zone, class, rset, res)) advice |= ((mrp_resource_mask_t)1 << rid); } - if (mandatory && (advice & mandatory) != mandatory) + if ((advice & mandatory) != mandatory) advice = 0; break; -- 2.7.4