RFS: Use self-contained recursive mutex

Update #2843.

1 files changed, 2 insertions, 29 deletions

diff --git a/cpukit/libfs/src/rfs/rtems-rfs-mutex.c b/cpukit/libfs/src/rfs/rtems-rfs-mutex.c
index a320d8093c..9c97c829ed 100644
--- a/cpukit/libfs/src/rfs/rtems-rfs-mutex.c
+++ b/cpukit/libfs/src/rfs/rtems-rfs-mutex.c
@@ -18,30 +18,11 @@
 
 #include <rtems/rfs/rtems-rfs-mutex.h>
 
-#if __rtems__
-/**
- * RTEMS_RFS Mutex Attributes
- */
-#define RTEMS_RFS_MUTEX_ATTRIBS \
-  (RTEMS_PRIORITY | RTEMS_BINARY_SEMAPHORE | \
-   RTEMS_INHERIT_PRIORITY | RTEMS_NO_PRIORITY_CEILING | RTEMS_LOCAL)
-#endif
-
 int
 rtems_rfs_mutex_create (rtems_rfs_mutex* mutex)
 {
 #if __rtems__
-  rtems_status_code sc;
-  sc = rtems_semaphore_create (rtems_build_name ('R', 'F', 'S', 'm'),
-                               1, RTEMS_RFS_MUTEX_ATTRIBS, 0,
-                               mutex);
-  if (sc != RTEMS_SUCCESSFUL)
-  {
-    if (rtems_rfs_trace (RTEMS_RFS_TRACE_MUTEX))
-      printf ("rtems-rfs: mutex: open failed: %s\n",
-              rtems_status_text (sc));
-    return EIO;
-  }
+  rtems_recursive_mutex_init(mutex, "RFS");
 #endif
   return 0;
 }
@@ -50,15 +31,7 @@ int
 rtems_rfs_mutex_destroy (rtems_rfs_mutex* mutex)
 {
 #if __rtems__
-  rtems_status_code sc;
-  sc = rtems_semaphore_delete (*mutex);
-  if (sc != RTEMS_SUCCESSFUL)
-  {
-    if (rtems_rfs_trace (RTEMS_RFS_TRACE_MUTEX))
-      printf ("rtems-rfs: mutex: close failed: %s\n",
-              rtems_status_text (sc));
-    return EIO;
-  }
+  rtems_recursive_mutex_destroy(mutex);
 #endif
   return 0;
 }