Skip to content

GitLab

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

Merge branch 'aufs5.10/01modular' into aufs5.x-rcN/01modular

parents 21566638 f2a3e916
Hide whitespace changes
Inline Side-by-side
fs/aufs/rwsem.h
View file @ 6124d9ae
...@@ -22,17 +22,21 @@ ...@@ -22,17 +22,21 @@
#ifdef CONFIG_LOCKDEP #ifdef CONFIG_LOCKDEP
/* 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))
#else #else
#define AuRwMustReadLock(rw) do {} while (0) #define AuRwMustReadLock(rw) do {} while (0)
......
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