diff options
author | Arnd Bergmann <arnd@arndb.de> | 2010-10-27 15:39:58 -0400 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2010-10-27 16:07:36 -0400 |
commit | 72f98e72551fad573c6cace8e8551ef094f482dd (patch) | |
tree | feeb5484ee69d3c9a9ef890037361f9ce55a42c4 /fs/locks.c | |
parent | f7347ce4ee7c65415f84be915c018473e7076f31 (diff) |
locks: turn lock_flocks into a spinlock
Nothing depends on lock_flocks using the BKL
any more, so we can do the switch over to
a private spinlock.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'fs/locks.c')
-rw-r--r-- | fs/locks.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/fs/locks.c b/fs/locks.c index 85fd9ce1abae..74c3df99c0e1 100644 --- a/fs/locks.c +++ b/fs/locks.c | |||
@@ -142,6 +142,7 @@ int lease_break_time = 45; | |||
142 | 142 | ||
143 | static LIST_HEAD(file_lock_list); | 143 | static LIST_HEAD(file_lock_list); |
144 | static LIST_HEAD(blocked_list); | 144 | static LIST_HEAD(blocked_list); |
145 | static DEFINE_SPINLOCK(file_lock_lock); | ||
145 | 146 | ||
146 | /* | 147 | /* |
147 | * Protects the two list heads above, plus the inode->i_flock list | 148 | * Protects the two list heads above, plus the inode->i_flock list |
@@ -149,13 +150,13 @@ static LIST_HEAD(blocked_list); | |||
149 | */ | 150 | */ |
150 | void lock_flocks(void) | 151 | void lock_flocks(void) |
151 | { | 152 | { |
152 | lock_kernel(); | 153 | spin_lock(&file_lock_lock); |
153 | } | 154 | } |
154 | EXPORT_SYMBOL_GPL(lock_flocks); | 155 | EXPORT_SYMBOL_GPL(lock_flocks); |
155 | 156 | ||
156 | void unlock_flocks(void) | 157 | void unlock_flocks(void) |
157 | { | 158 | { |
158 | unlock_kernel(); | 159 | spin_unlock(&file_lock_lock); |
159 | } | 160 | } |
160 | EXPORT_SYMBOL_GPL(unlock_flocks); | 161 | EXPORT_SYMBOL_GPL(unlock_flocks); |
161 | 162 | ||