[incubator-nuttx] 01/02: fs: Initialize fs_allmaps_s::exclsem in declaration directly

[ma...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

masayuki pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git

commit ec30d6ef6b6e246dc32407675c4b54140df33673
Author: Xiang Xiao <xi...@xiaomi.com>
AuthorDate: Thu Jun 24 01:42:11 2021 +0800

    fs: Initialize fs_allmaps_s::exclsem in declaration directly
    
    and then remove rammap_initialize and caller
    
    Signed-off-by: Xiang Xiao <xi...@xiaomi.com>
    Change-Id: Ife9f04d409b3a14a3be4bbb61c23da6e7a9f8a3d
---
 fs/mmap/fs_munmap.c |  1 -
 fs/mmap/fs_rammap.c | 29 ++++-------------------------
 fs/mmap/fs_rammap.h |  1 -
 3 files changed, 4 insertions(+), 27 deletions(-)

diff --git a/fs/mmap/fs_munmap.c b/fs/mmap/fs_munmap.c
index c0404a2..bb4f127 100644
--- a/fs/mmap/fs_munmap.c
+++ b/fs/mmap/fs_munmap.c
@@ -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 */
 
-  rammap_initialize();
   ret = nxsem_wait(&g_rammaps.exclsem);
   if (ret < 0)
     {
diff --git a/fs/mmap/fs_rammap.c b/fs/mmap/fs_rammap.c
index 55a9830..2145a7a 100644
--- a/fs/mmap/fs_rammap.c
+++ b/fs/mmap/fs_rammap.c
@@ -46,36 +46,16 @@
 
 /* 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
  ****************************************************************************/
 
 /****************************************************************************
- * 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
  *
  * Description:
@@ -197,7 +177,6 @@ FAR void *rammap(int fd, size_t length, off_t offset)
 
   /* Add the buffer to the list of regions */
 
-  rammap_initialize();
   ret = nxsem_wait(&g_rammaps.exclsem);
   if (ret < 0)
     {
diff --git a/fs/mmap/fs_rammap.h b/fs/mmap/fs_rammap.h
index 8e107c0..fc8a6c9 100644
--- a/fs/mmap/fs_rammap.h
+++ b/fs/mmap/fs_rammap.h
@@ -65,7 +65,6 @@ struct fs_rammap_s
 
 struct fs_allmaps_s
 {
-  bool                initialized; /* True: This structure has been initialized */
   sem_t               exclsem;     /* Provides exclusive access the list */
   struct fs_rammap_s *head;        /* List of mapped files */
 };