aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/linux/reiserfs_fs.h9
1 files changed, 9 insertions, 0 deletions
diff --git a/include/linux/reiserfs_fs.h b/include/linux/reiserfs_fs.h
index 35d3f459b0ac..793bf8351ab8 100644
--- a/include/linux/reiserfs_fs.h
+++ b/include/linux/reiserfs_fs.h
@@ -62,6 +62,12 @@ void reiserfs_write_unlock(struct super_block *s);
62int reiserfs_write_lock_once(struct super_block *s); 62int reiserfs_write_lock_once(struct super_block *s);
63void reiserfs_write_unlock_once(struct super_block *s, int lock_depth); 63void reiserfs_write_unlock_once(struct super_block *s, int lock_depth);
64 64
65#ifdef CONFIG_REISERFS_CHECK
66void reiserfs_lock_check_recursive(struct super_block *s);
67#else
68static inline void reiserfs_lock_check_recursive(struct super_block *s) { }
69#endif
70
65/* 71/*
66 * Several mutexes depend on the write lock. 72 * Several mutexes depend on the write lock.
67 * However sometimes we want to relax the write lock while we hold 73 * However sometimes we want to relax the write lock while we hold
@@ -92,6 +98,7 @@ void reiserfs_write_unlock_once(struct super_block *s, int lock_depth);
92static inline void reiserfs_mutex_lock_safe(struct mutex *m, 98static inline void reiserfs_mutex_lock_safe(struct mutex *m,
93 struct super_block *s) 99 struct super_block *s)
94{ 100{
101 reiserfs_lock_check_recursive(s);
95 reiserfs_write_unlock(s); 102 reiserfs_write_unlock(s);
96 mutex_lock(m); 103 mutex_lock(m);
97 reiserfs_write_lock(s); 104 reiserfs_write_lock(s);
@@ -101,6 +108,7 @@ static inline void
101reiserfs_mutex_lock_nested_safe(struct mutex *m, unsigned int subclass, 108reiserfs_mutex_lock_nested_safe(struct mutex *m, unsigned int subclass,
102 struct super_block *s) 109 struct super_block *s)
103{ 110{
111 reiserfs_lock_check_recursive(s);
104 reiserfs_write_unlock(s); 112 reiserfs_write_unlock(s);
105 mutex_lock_nested(m, subclass); 113 mutex_lock_nested(m, subclass);
106 reiserfs_write_lock(s); 114 reiserfs_write_lock(s);
@@ -109,6 +117,7 @@ reiserfs_mutex_lock_nested_safe(struct mutex *m, unsigned int subclass,
109static inline void 117static inline void
110reiserfs_down_read_safe(struct rw_semaphore *sem, struct super_block *s) 118reiserfs_down_read_safe(struct rw_semaphore *sem, struct super_block *s)
111{ 119{
120 reiserfs_lock_check_recursive(s);
112 reiserfs_write_unlock(s); 121 reiserfs_write_unlock(s);
113 down_read(sem); 122 down_read(sem);
114 reiserfs_write_lock(s); 123 reiserfs_write_lock(s);