Remove misguided HAVE_MUTEX_OWNER check

[mirror_spl.git] / include / sys / mutex.h

diff --git a/include/sys/mutex.h b/include/sys/mutex.h
index 6355782c0592e97d4f0c40c3f63d58328f2959bf..d6bd99b4c627fc79261c7574111a005273772dbb 100644 (file)
--- a/include/sys/mutex.h
+++ b/include/sys/mutex.h
@@ -28,28 +28,72 @@
 #include <sys/types.h>
 #include <linux/mutex.h>
 #include <linux/compiler_compat.h>
+#include <linux/lockdep.h>
 
 typedef enum {
        MUTEX_DEFAULT   = 0,
        MUTEX_SPIN      = 1,
        MUTEX_ADAPTIVE  = 2,
-       MUTEX_FSTRANS   = 3,
+       MUTEX_NOLOCKDEP = 3
 } kmutex_type_t;
 
 typedef struct {
        struct mutex            m_mutex;
-       kmutex_type_t           m_type;
        spinlock_t              m_lock; /* used for serializing mutex_exit */
+       /* only when kernel doesn't have owner */
        kthread_t               *m_owner;
-       unsigned int            m_saved_flags;
+#ifdef CONFIG_LOCKDEP
+       kmutex_type_t           m_type;
+#endif /* CONFIG_LOCKDEP */
 } kmutex_t;
 
 #define        MUTEX(mp)               (&((mp)->m_mutex))
-#define        mutex_owner(mp)         (ACCESS_ONCE((mp)->m_owner))
+
+static inline void
+spl_mutex_set_owner(kmutex_t *mp)
+{
+       /*
+        * kernel will handle its owner, so we don't need to do anything if it
+        * is defined.
+        */
+       mp->m_owner = current;
+}
+
+static inline void
+spl_mutex_clear_owner(kmutex_t *mp)
+{
+       mp->m_owner = NULL;
+}
+
+#define        mutex_owner(mp)         (ACCESS_ONCE(MUTEX(mp)->owner))
 #define        mutex_owned(mp)         (mutex_owner(mp) == current)
 #define        MUTEX_HELD(mp)          mutex_owned(mp)
 #define        MUTEX_NOT_HELD(mp)      (!MUTEX_HELD(mp))
 
+#ifdef CONFIG_LOCKDEP
+static inline void
+spl_mutex_set_type(kmutex_t *mp, kmutex_type_t type)
+{
+       mp->m_type = type;
+}
+static inline void
+spl_mutex_lockdep_off_maybe(kmutex_t *mp)                      \
+{                                                              \
+       if (mp && mp->m_type == MUTEX_NOLOCKDEP)                \
+               lockdep_off();                                  \
+}
+static inline void
+spl_mutex_lockdep_on_maybe(kmutex_t *mp)                       \
+{                                                              \
+       if (mp && mp->m_type == MUTEX_NOLOCKDEP)                \
+               lockdep_on();                                   \
+}
+#else  /* CONFIG_LOCKDEP */
+#define spl_mutex_set_type(mp, type)
+#define spl_mutex_lockdep_off_maybe(mp)
+#define spl_mutex_lockdep_on_maybe(mp)
+#endif /* CONFIG_LOCKDEP */
+
 /*
  * The following functions must be a #define and not static inline.
  * This ensures that the native linux mutex functions (lock/unlock)
@@ -60,18 +104,12 @@ typedef struct {
 #define        mutex_init(mp, name, type, ibc)                         \
 {                                                              \
        static struct lock_class_key __key;                     \
-                                                               \
-       ASSERT3P(mp, !=, NULL);                                 \
-       ASSERT3P(ibc, ==, NULL);                                \
-       ASSERT((type == MUTEX_DEFAULT) ||                       \
-           (type == MUTEX_ADAPTIVE) ||                         \
-           (type == MUTEX_FSTRANS));                           \
+       ASSERT(type == MUTEX_DEFAULT || type == MUTEX_NOLOCKDEP); \
                                                                \
        __mutex_init(MUTEX(mp), (name) ? (#name) : (#mp), &__key); \
        spin_lock_init(&(mp)->m_lock);                          \
-       (mp)->m_type = type;                                    \
-       (mp)->m_owner = NULL;                                   \
-       (mp)->m_saved_flags = 0;                                \
+       spl_mutex_clear_owner(mp);                              \
+       spl_mutex_set_type(mp, type);                           \
 }
 
 #undef mutex_destroy
@@ -84,13 +122,10 @@ typedef struct {
 ({                                                             \
        int _rc_;                                               \
                                                                \
-       if ((_rc_ = mutex_trylock(MUTEX(mp))) == 1) {           \
-               (mp)->m_owner = current;                        \
-               if ((mp)->m_type == MUTEX_FSTRANS) {            \
-                       (mp)->m_saved_flags = current->flags;   \
-                       current->flags |= PF_FSTRANS;           \
-               }                                               \
-       }                                                       \
+       spl_mutex_lockdep_off_maybe(mp);                        \
+       if ((_rc_ = mutex_trylock(MUTEX(mp))) == 1)             \
+               spl_mutex_set_owner(mp);                        \
+       spl_mutex_lockdep_on_maybe(mp);                         \
                                                                \
        _rc_;                                                   \
 })
@@ -99,23 +134,19 @@ typedef struct {
 #define        mutex_enter_nested(mp, subclass)                        \
 {                                                              \
        ASSERT3P(mutex_owner(mp), !=, current);                 \
+       spl_mutex_lockdep_off_maybe(mp);                        \
        mutex_lock_nested(MUTEX(mp), (subclass));               \
-       (mp)->m_owner = current;                                \
-       if ((mp)->m_type == MUTEX_FSTRANS) {                    \
-               (mp)->m_saved_flags = current->flags;           \
-               current->flags |= PF_FSTRANS;                   \
-       }                                                       \
+       spl_mutex_lockdep_on_maybe(mp);                         \
+       spl_mutex_set_owner(mp);                                \
 }
 #else /* CONFIG_DEBUG_LOCK_ALLOC */
 #define        mutex_enter_nested(mp, subclass)                        \
 {                                                              \
        ASSERT3P(mutex_owner(mp), !=, current);                 \
+       spl_mutex_lockdep_off_maybe(mp);                        \
        mutex_lock(MUTEX(mp));                                  \
-       (mp)->m_owner = current;                                \
-       if ((mp)->m_type == MUTEX_FSTRANS) {                    \
-               (mp)->m_saved_flags = current->flags;           \
-               current->flags |= PF_FSTRANS;                   \
-       }                                                       \
+       spl_mutex_lockdep_on_maybe(mp);                         \
+       spl_mutex_set_owner(mp);                                \
 }
 #endif /*  CONFIG_DEBUG_LOCK_ALLOC */
 
@@ -142,14 +173,12 @@ typedef struct {
  */
 #define        mutex_exit(mp)                                          \
 {                                                              \
+       spl_mutex_lockdep_off_maybe(mp);                        \
        spin_lock(&(mp)->m_lock);                               \
-       if ((mp)->m_type == MUTEX_FSTRANS) {                    \
-               current->flags &= ~(PF_FSTRANS);                \
-               current->flags |= (mp)->m_saved_flags;          \
-       }                                                       \
-       (mp)->m_owner = NULL;                                   \
+       spl_mutex_clear_owner(mp);                              \
        mutex_unlock(MUTEX(mp));                                \
        spin_unlock(&(mp)->m_lock);                             \
+       spl_mutex_lockdep_on_maybe(mp);                         \
 }
 
 int spl_mutex_init(void);