Skip to content

GitLab

Commit d1630086 authored by J. R. Okajima's avatar J. R. Okajima
Browse files

Merge branch 'aufs5.8/01modular' into aufs5.9/01modular

parents 6b6e0457 dac6be84
Hide whitespace changes
Inline Side-by-side
fs/aufs/rwsem.h
View file @ d1630086
...@@ -20,17 +20,21 @@ ...@@ -20,17 +20,21 @@
/* to debug easier, do not make them inlined functions */ /* to debug easier, do not make them inlined functions */
#define AuRwMustNoWaiters(rw) AuDebugOn(rwsem_is_contended(rw)) #define AuRwMustNoWaiters(rw) AuDebugOn(rwsem_is_contended(rw))
/* rwsem_is_locked() is unusable */ /* rwsem_is_locked() is unusable */
#define AuRwMustReadLock(rw) AuDebugOn(!lockdep_recursing(current) \ #define AuRwMustReadLock(rw) AuDebugOn(IS_ENABLED(CONFIG_LOCKDEP) \
&& debug_locks \ && !lockdep_recursing(current) \
&& debug_locks \
&& !lockdep_is_held_type(rw, 1)) && !lockdep_is_held_type(rw, 1))
#define AuRwMustWriteLock(rw) AuDebugOn(!lockdep_recursing(current) \ #define AuRwMustWriteLock(rw) AuDebugOn(IS_ENABLED(CONFIG_LOCKDEP) \
&& debug_locks \ && !lockdep_recursing(current) \
&& debug_locks \
&& !lockdep_is_held_type(rw, 0)) && !lockdep_is_held_type(rw, 0))
#define AuRwMustAnyLock(rw) AuDebugOn(!lockdep_recursing(current) \ #define AuRwMustAnyLock(rw) AuDebugOn(IS_ENABLED(CONFIG_LOCKDEP) \
&& debug_locks \ && !lockdep_recursing(current) \
&& debug_locks \
&& !lockdep_is_held(rw)) && !lockdep_is_held(rw))
#define AuRwDestroy(rw) AuDebugOn(!lockdep_recursing(current) \ #define AuRwDestroy(rw) AuDebugOn(IS_ENABLED(CONFIG_LOCKDEP) \
&& debug_locks \ && !lockdep_recursing(current) \
&& debug_locks \
&& lockdep_is_held(rw)) && lockdep_is_held(rw))
#define au_rw_init(rw) init_rwsem(rw) #define au_rw_init(rw) init_rwsem(rw)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment