Skip to content

GitLab

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

Merge branch 'aufs5.4/00base' into aufs5.4.3/00base

parents bb91111c 3848a97e
Show whitespace changes
Inline Side-by-side
fs/aufs/rwsem.h
View file @ 0114086e
...@@ -20,16 +20,20 @@ ...@@ -20,16 +20,20 @@
/* 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) \
&& !lockdep_recursing(current) \
&& debug_locks \ && 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) \
&& !lockdep_recursing(current) \
&& debug_locks \ && 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) \
&& !lockdep_recursing(current) \
&& debug_locks \ && 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) \
&& !lockdep_recursing(current) \
&& debug_locks \ && debug_locks \
&& lockdep_is_held(rw)) && lockdep_is_held(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