diff options
Diffstat (limited to 'fs/xfs/mrlock.h')
-rw-r--r-- | fs/xfs/mrlock.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/fs/xfs/mrlock.h b/fs/xfs/mrlock.h index ff6a19873e5c..e3c92d19e540 100644 --- a/fs/xfs/mrlock.h +++ b/fs/xfs/mrlock.h | |||
@@ -22,12 +22,12 @@ | |||
22 | 22 | ||
23 | typedef struct { | 23 | typedef struct { |
24 | struct rw_semaphore mr_lock; | 24 | struct rw_semaphore mr_lock; |
25 | #ifdef DEBUG | 25 | #if defined(DEBUG) || defined(XFS_WARN) |
26 | int mr_writer; | 26 | int mr_writer; |
27 | #endif | 27 | #endif |
28 | } mrlock_t; | 28 | } mrlock_t; |
29 | 29 | ||
30 | #ifdef DEBUG | 30 | #if defined(DEBUG) || defined(XFS_WARN) |
31 | #define mrinit(mrp, name) \ | 31 | #define mrinit(mrp, name) \ |
32 | do { (mrp)->mr_writer = 0; init_rwsem(&(mrp)->mr_lock); } while (0) | 32 | do { (mrp)->mr_writer = 0; init_rwsem(&(mrp)->mr_lock); } while (0) |
33 | #else | 33 | #else |
@@ -46,7 +46,7 @@ static inline void mraccess_nested(mrlock_t *mrp, int subclass) | |||
46 | static inline void mrupdate_nested(mrlock_t *mrp, int subclass) | 46 | static inline void mrupdate_nested(mrlock_t *mrp, int subclass) |
47 | { | 47 | { |
48 | down_write_nested(&mrp->mr_lock, subclass); | 48 | down_write_nested(&mrp->mr_lock, subclass); |
49 | #ifdef DEBUG | 49 | #if defined(DEBUG) || defined(XFS_WARN) |
50 | mrp->mr_writer = 1; | 50 | mrp->mr_writer = 1; |
51 | #endif | 51 | #endif |
52 | } | 52 | } |
@@ -60,7 +60,7 @@ static inline int mrtryupdate(mrlock_t *mrp) | |||
60 | { | 60 | { |
61 | if (!down_write_trylock(&mrp->mr_lock)) | 61 | if (!down_write_trylock(&mrp->mr_lock)) |
62 | return 0; | 62 | return 0; |
63 | #ifdef DEBUG | 63 | #if defined(DEBUG) || defined(XFS_WARN) |
64 | mrp->mr_writer = 1; | 64 | mrp->mr_writer = 1; |
65 | #endif | 65 | #endif |
66 | return 1; | 66 | return 1; |
@@ -68,7 +68,7 @@ static inline int mrtryupdate(mrlock_t *mrp) | |||
68 | 68 | ||
69 | static inline void mrunlock_excl(mrlock_t *mrp) | 69 | static inline void mrunlock_excl(mrlock_t *mrp) |
70 | { | 70 | { |
71 | #ifdef DEBUG | 71 | #if defined(DEBUG) || defined(XFS_WARN) |
72 | mrp->mr_writer = 0; | 72 | mrp->mr_writer = 0; |
73 | #endif | 73 | #endif |
74 | up_write(&mrp->mr_lock); | 74 | up_write(&mrp->mr_lock); |
@@ -81,7 +81,7 @@ static inline void mrunlock_shared(mrlock_t *mrp) | |||
81 | 81 | ||
82 | static inline void mrdemote(mrlock_t *mrp) | 82 | static inline void mrdemote(mrlock_t *mrp) |
83 | { | 83 | { |
84 | #ifdef DEBUG | 84 | #if defined(DEBUG) || defined(XFS_WARN) |
85 | mrp->mr_writer = 0; | 85 | mrp->mr_writer = 0; |
86 | #endif | 86 | #endif |
87 | downgrade_write(&mrp->mr_lock); | 87 | downgrade_write(&mrp->mr_lock); |