sergiotarxz/nuttx
sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fs: Initialize fs_allmaps_s::exclsem in declaration directly

Browse Source 
and then remove rammap_initialize and caller

Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
Change-Id: Ife9f04d409b3a14a3be4bbb61c23da6e7a9f8a3d
This commit is contained in:
Xiang Xiao 2021-06-24 01:42:11 +08:00 committed by Masayuki Ishikawa
parent 4ba1bafe55
commit ec30d6ef6b
3 changed files with 4 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
fs/mmap/fs_munmap.c
View File

@ -103,7 +103,6 @@ int munmap(FAR void *start, size_t length)
/* Find a region containing this start and length in the list of regions */ /* Find a region containing this start and length in the list of regions */
rammap_initialize();
ret = nxsem_wait(&g_rammaps.exclsem); ret = nxsem_wait(&g_rammaps.exclsem);
if (ret < 0) if (ret < 0)
{ {

29
fs/mmap/fs_rammap.c
View File

@ -46,35 +46,15 @@
/* This is the list of all mapped files */ /* This is the list of all mapped files */
struct fs_allmaps_s g_rammaps; struct fs_allmaps_s g_rammaps =
{
SEM_INITIALIZER(1)
};
/**************************************************************************** /****************************************************************************
* Public Functions * Public Functions
****************************************************************************/ ****************************************************************************/
/****************************************************************************
* Name: rammap_initialize
*
* Description:
* Verified that this capability has been initialized.
*
* Input Parameters:
* None
*
* Returned Value:
* None
*
****************************************************************************/
void rammap_initialize(void)
{
if (!g_rammaps.initialized)
{
nxsem_init(&g_rammaps.exclsem, 0, 1);
g_rammaps.initialized = true;
}
}
/**************************************************************************** /****************************************************************************
* Name: rammmap * Name: rammmap
* *
@ -197,7 +177,6 @@ FAR void *rammap(int fd, size_t length, off_t offset)
/* Add the buffer to the list of regions */ /* Add the buffer to the list of regions */
rammap_initialize();
ret = nxsem_wait(&g_rammaps.exclsem); ret = nxsem_wait(&g_rammaps.exclsem);
if (ret < 0) if (ret < 0)
{ {

1
fs/mmap/fs_rammap.h
View File

@ -65,7 +65,6 @@ struct fs_rammap_s
struct fs_allmaps_s struct fs_allmaps_s
{ {
bool initialized; /* True: This structure has been initialized */
sem_t exclsem; /* Provides exclusive access the list */ sem_t exclsem; /* Provides exclusive access the list */
struct fs_rammap_s *head; /* List of mapped files */ struct fs_rammap_s *head; /* List of mapped files */
}; };