RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

libblock: Avoid recursive mutex

Browse Source
This commit is contained in:
Sebastian Huber
2014-06-03 08:28:46 +02:00
parent 5abe5a8122
commit 98f2d5c505
1 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
cpukit/libblock/src/bdbuf.c
View File

@@ -182,7 +182,6 @@ typedef enum {
RTEMS_BDBUF_FATAL_ONCE,
RTEMS_BDBUF_FATAL_MTX_ATTR_INIT,
RTEMS_BDBUF_FATAL_MTX_ATTR_SETPROTO,
RTEMS_BDBUF_FATAL_MTX_ATTR_SETTYPE,
RTEMS_BDBUF_FATAL_CV_WAIT,
RTEMS_BDBUF_FATAL_CV_BROADCAST
} rtems_bdbuf_fatal_code;
@@ -351,10 +350,6 @@ rtems_bdbuf_lock_create (rtems_name name, rtems_bdbuf_lock_type *lock)
if (eno != 0)
rtems_bdbuf_fatal (RTEMS_BDBUF_FATAL_MTX_ATTR_SETPROTO);
eno = pthread_mutexattr_settype (&attr, PTHREAD_MUTEX_RECURSIVE);
if (eno != 0)
rtems_bdbuf_fatal (RTEMS_BDBUF_FATAL_MTX_ATTR_SETTYPE);
eno = pthread_mutex_init (lock, &attr);
pthread_mutexattr_destroy (&attr);
@@ -3093,16 +3088,22 @@ rtems_bdbuf_gather_for_purge (rtems_chain_control *purge_list,
}
}
void
rtems_bdbuf_purge_dev (rtems_disk_device *dd)
static void
rtems_bdbuf_do_purge_dev (rtems_disk_device *dd)
{
rtems_chain_control purge_list;
rtems_chain_initialize_empty (&purge_list);
rtems_bdbuf_lock_cache ();
rtems_bdbuf_read_ahead_reset (dd);
rtems_bdbuf_gather_for_purge (&purge_list, dd);
rtems_bdbuf_purge_list (&purge_list);
}
void
rtems_bdbuf_purge_dev (rtems_disk_device *dd)
{
rtems_bdbuf_lock_cache ();
rtems_bdbuf_do_purge_dev (dd);
rtems_bdbuf_unlock_cache ();
}
@@ -3146,7 +3147,7 @@ rtems_bdbuf_set_block_size (rtems_disk_device *dd,
dd->block_to_media_block_shift = block_to_media_block_shift;
dd->bds_per_group = bds_per_group;
rtems_bdbuf_purge_dev (dd);
rtems_bdbuf_do_purge_dev (dd);
}
else
{