Rename RSM Mutex to FIFO Mutex

3 files changed, 57 insertions, 57 deletions

diff --git a/include/litmus/fdso.h b/include/litmus/fdso.h
index 1469c0fd0460..e1a0ac24b8a2 100644
--- a/include/litmus/fdso.h
+++ b/include/litmus/fdso.h
@@ -26,7 +26,7 @@ typedef enum  {
 
         PCP_SEM     = 5,
 
-        RSM_MUTEX       = 6,
+        FIFO_MUTEX      = 6,
         IKGLP_SEM       = 7,
         KFMLP_SEM       = 8,
 
@@ -83,7 +83,7 @@ static inline void* od_lookup(int od, obj_type_t type)
 #define lookup_srp_sem(od) ((struct srp_semaphore*) od_lookup(od, SRP_SEM))
 #define lookup_ics(od)     ((struct ics*)           od_lookup(od, ICS_ID))
 
-#define lookup_rsm_mutex(od)((struct litmus_lock*)  od_lookup(od, FMLP_SEM))
+#define lookup_fifo_mutex(od)((struct litmus_lock*)  od_lookup(od, FIFO_MUTEX))
 
 
 #endif
diff --git a/include/litmus/fifo_lock.h b/include/litmus/fifo_lock.h
new file mode 100644
index 000000000000..4b970806117f
--- /dev/null
+++ b/include/litmus/fifo_lock.h
@@ -0,0 +1,55 @@
+#ifndef LITMUS_fifo_H
+#define LITMUS_fifo_H
+
+#include <litmus/litmus.h>
+#include <litmus/binheap.h>
+#include <litmus/locking.h>
+
+/* struct for semaphore with priority inheritance */
+struct fifo_mutex {
+        struct litmus_lock litmus_lock;
+
+        /* current resource holder */
+        struct task_struct *owner;
+
+        /* highest-priority waiter */
+        struct task_struct *hp_waiter;
+
+        /* FIFO queue of waiting tasks -- for now.  time stamp in the future. */
+        wait_queue_head_t       wait;
+
+        /* we do some nesting within spinlocks, so we can't use the normal
+         sleeplocks found in wait_queue_head_t. */
+        raw_spinlock_t          lock;
+};
+
+static inline struct fifo_mutex* fifo_mutex_from_lock(struct litmus_lock* lock)
+{
+        return container_of(lock, struct fifo_mutex, litmus_lock);
+}
+
+#ifdef CONFIG_LITMUS_DGL_SUPPORT
+int fifo_mutex_is_owner(struct litmus_lock *l, struct task_struct *t);
+int fifo_mutex_dgl_lock(struct litmus_lock *l, dgl_wait_state_t* dgl_wait, wait_queue_t* wq_node);
+void fifo_mutex_enable_priority(struct litmus_lock *l, dgl_wait_state_t* dgl_wait);
+#endif
+
+void fifo_mutex_propagate_increase_inheritance(struct litmus_lock* l,
+                                                                                          struct task_struct* t,
+                                                                                          raw_spinlock_t* to_unlock,
+                                                                                          unsigned long irqflags);
+
+void fifo_mutex_propagate_decrease_inheritance(struct litmus_lock* l,
+                                                                                          struct task_struct* t,
+                                                                                          raw_spinlock_t* to_unlock,
+                                                                                          unsigned long irqflags);
+
+int fifo_mutex_lock(struct litmus_lock* l);
+int fifo_mutex_unlock(struct litmus_lock* l);
+int fifo_mutex_close(struct litmus_lock* l);
+void fifo_mutex_free(struct litmus_lock* l);
+struct litmus_lock* fifo_mutex_new(struct litmus_lock_ops*);
+
+
+#endif
+
diff --git a/include/litmus/rsm_lock.h b/include/litmus/rsm_lock.h
deleted file mode 100644
index f0d263322a69..000000000000
--- a/include/litmus/rsm_lock.h
+++ /dev/null
@@ -1,55 +0,0 @@
-#ifndef LITMUS_RSM_H
-#define LITMUS_RSM_H
-
-#include <litmus/litmus.h>
-#include <litmus/binheap.h>
-#include <litmus/locking.h>
-
-/* struct for semaphore with priority inheritance */
-struct rsm_mutex {
-        struct litmus_lock litmus_lock;
-
-        /* current resource holder */
-        struct task_struct *owner;
-
-        /* highest-priority waiter */
-        struct task_struct *hp_waiter;
-
-        /* FIFO queue of waiting tasks -- for now.  time stamp in the future. */
-        wait_queue_head_t       wait;
-
-        /* we do some nesting within spinlocks, so we can't use the normal
-         sleeplocks found in wait_queue_head_t. */
-        raw_spinlock_t          lock;
-};
-
-static inline struct rsm_mutex* rsm_mutex_from_lock(struct litmus_lock* lock)
-{
-        return container_of(lock, struct rsm_mutex, litmus_lock);
-}
-
-#ifdef CONFIG_LITMUS_DGL_SUPPORT
-int rsm_mutex_is_owner(struct litmus_lock *l, struct task_struct *t);
-int rsm_mutex_dgl_lock(struct litmus_lock *l, dgl_wait_state_t* dgl_wait, wait_queue_t* wq_node);
-void rsm_mutex_enable_priority(struct litmus_lock *l, dgl_wait_state_t* dgl_wait);
-#endif
-
-void rsm_mutex_propagate_increase_inheritance(struct litmus_lock* l,
-                                                                                          struct task_struct* t,
-                                                                                          raw_spinlock_t* to_unlock,
-                                                                                          unsigned long irqflags);
-
-void rsm_mutex_propagate_decrease_inheritance(struct litmus_lock* l,
-                                                                                          struct task_struct* t,
-                                                                                          raw_spinlock_t* to_unlock,
-                                                                                          unsigned long irqflags);
-
-int rsm_mutex_lock(struct litmus_lock* l);
-int rsm_mutex_unlock(struct litmus_lock* l);
-int rsm_mutex_close(struct litmus_lock* l);
-void rsm_mutex_free(struct litmus_lock* l);
-struct litmus_lock* rsm_mutex_new(struct litmus_lock_ops*);
-
-
-#endif
-