summaryrefslogtreecommitdiffstats
path: root/cpukit/rtems/src/regiondelete.c
diff options
context:
space:
mode:
authorSebastian Huber <sebastian.huber@embedded-brains.de>2016-04-08 06:56:46 +0200
committerSebastian Huber <sebastian.huber@embedded-brains.de>2016-04-12 07:36:19 +0200
commit1142f5593a5b6ab65d47bafb749e0709c7d2daa2 (patch)
tree44d5b886a880307bd6f38550a7275071f38965a7 /cpukit/rtems/src/regiondelete.c
parentscore: Simplify _Objects_Get_no_protection() (diff)
downloadrtems-1142f5593a5b6ab65d47bafb749e0709c7d2daa2.tar.bz2
rtems: Add and use _Region_Get_and_lock()
Get region and lock allocator in _Region_Get_and_lock() in case the region exists and unlock it in _Region_Unlock().
Diffstat (limited to 'cpukit/rtems/src/regiondelete.c')
-rw-r--r--cpukit/rtems/src/regiondelete.c28
1 files changed, 14 insertions, 14 deletions
diff --git a/cpukit/rtems/src/regiondelete.c b/cpukit/rtems/src/regiondelete.c
index 3927a545d6..684c2a9b96 100644
--- a/cpukit/rtems/src/regiondelete.c
+++ b/cpukit/rtems/src/regiondelete.c
@@ -28,23 +28,23 @@ rtems_status_code rtems_region_delete(
Region_Control *the_region;
_Objects_Allocator_lock();
- _RTEMS_Lock_allocator();
-
- the_region = _Region_Get( id );
-
- if ( the_region != NULL ) {
- if ( the_region->number_of_used_blocks != 0 ) {
- status = RTEMS_RESOURCE_IN_USE;
- } else {
- _Objects_Close( &_Region_Information, &the_region->Object );
- _Region_Free( the_region );
- status = RTEMS_SUCCESSFUL;
- }
+
+ the_region = _Region_Get_and_lock( id );
+
+ if ( the_region == NULL ) {
+ _Objects_Allocator_unlock();
+ return RTEMS_INVALID_ID;
+ }
+
+ if ( the_region->number_of_used_blocks != 0 ) {
+ status = RTEMS_RESOURCE_IN_USE;
} else {
- status = RTEMS_INVALID_ID;
+ _Objects_Close( &_Region_Information, &the_region->Object );
+ _Region_Free( the_region );
+ status = RTEMS_SUCCESSFUL;
}
- _RTEMS_Unlock_allocator();
+ _Region_Unlock( the_region );
_Objects_Allocator_unlock();
return status;
}