Add MUTEX_FSTRANS mutex type

[mirror_spl.git] / module / splat / splat-atomic.c

diff --git a/module/splat/splat-atomic.c b/module/splat/splat-atomic.c
index f702196bedc2a216a304d6583d2c7ff89762b051..e94f42f00b15da2ea1cf7799aa6e3fd294ab1510 100644 (file)
--- a/module/splat/splat-atomic.c
+++ b/module/splat/splat-atomic.c
@@ -26,6 +26,8 @@
 
 #include <sys/atomic.h>
 #include <sys/thread.h>
+#include <sys/mutex.h>
+#include <linux/mm_compat.h>
 #include <linux/slab.h>
 #include "splat-internal.h"
 
@@ -52,7 +54,7 @@ typedef enum {
 typedef struct atomic_priv {
         unsigned long ap_magic;
         struct file *ap_file;
-       struct mutex ap_lock;
+       kmutex_t ap_lock;
         wait_queue_head_t ap_waitq;
        volatile uint64_t ap_atomic;
        volatile uint64_t ap_atomic_exited;
@@ -70,10 +72,10 @@ splat_atomic_work(void *priv)
        ap = (atomic_priv_t *)priv;
        ASSERT(ap->ap_magic == SPLAT_ATOMIC_TEST_MAGIC);
 
-       mutex_lock(&ap->ap_lock);
+       mutex_enter(&ap->ap_lock);
        op = ap->ap_op;
        wake_up(&ap->ap_waitq);
-       mutex_unlock(&ap->ap_lock);
+       mutex_exit(&ap->ap_lock);
 
         splat_vprint(ap->ap_file, SPLAT_ATOMIC_TEST1_NAME,
                     "Thread %d successfully started: %lu/%lu\n", op,
@@ -143,13 +145,13 @@ splat_atomic_test1(struct file *file, void *arg)
 
        ap.ap_magic = SPLAT_ATOMIC_TEST_MAGIC;
        ap.ap_file = file;
-       mutex_init(&ap.ap_lock);
+       mutex_init(&ap.ap_lock, SPLAT_ATOMIC_TEST1_NAME, MUTEX_DEFAULT, NULL);
        init_waitqueue_head(&ap.ap_waitq);
        ap.ap_atomic = SPLAT_ATOMIC_INIT_VALUE;
        ap.ap_atomic_exited = 0;
 
        for (i = 0; i < SPLAT_ATOMIC_COUNT_64; i++) {
-               mutex_lock(&ap.ap_lock);
+               mutex_enter(&ap.ap_lock);
                ap.ap_op = i;
 
                thr = (kthread_t *)thread_create(NULL, 0, splat_atomic_work,
@@ -157,14 +159,14 @@ splat_atomic_test1(struct file *file, void *arg)
                                                 minclsyspri);
                if (thr == NULL) {
                        rc = -ESRCH;
-                       mutex_unlock(&ap.ap_lock);
+                       mutex_exit(&ap.ap_lock);
                        break;
                }
 
                /* Prepare to wait, the new thread will wake us once it
                 * has made a copy of the unique private passed data */
                 prepare_to_wait(&ap.ap_waitq, &wait, TASK_UNINTERRUPTIBLE);
-               mutex_unlock(&ap.ap_lock);
+               mutex_exit(&ap.ap_lock);
                schedule();
        }
 
@@ -187,6 +189,8 @@ splat_atomic_test1(struct file *file, void *arg)
                   "Success initial and final values match, %lu == %lu\n",
                   (long unsigned)ap.ap_atomic, SPLAT_ATOMIC_INIT_VALUE);
 
+       mutex_destroy(&ap.ap_lock);
+
        return 0;
 }