diff options
| author | Nick Piggin <npiggin@suse.de> | 2008-10-18 20:27:00 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-20 08:52:32 -0700 |
| commit | 51b07fc3c5c830bb49c80fc5eac041e1f66a72e7 (patch) | |
| tree | 7d01d39f5eb5ac601d95c1e133492bd83135af6c | |
| parent | 8413ac9d8c9a1366a4f57880723126cd24e5a5c3 (diff) | |
| download | op-kernel-dev-51b07fc3c5c830bb49c80fc5eac041e1f66a72e7.zip op-kernel-dev-51b07fc3c5c830bb49c80fc5eac041e1f66a72e7.tar.gz | |
fs: buffer lock use lock bitops
trylock_buffer and unlock_buffer open and close a critical section.
Hence, we can use the lock bitops to get the desired memory ordering.
Signed-off-by: Nick Piggin <npiggin@suse.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
| -rw-r--r-- | fs/buffer.c | 3 | ||||
| -rw-r--r-- | include/linux/buffer_head.h | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/fs/buffer.c b/fs/buffer.c index ac78d4c..6569fda 100644 --- a/fs/buffer.c +++ b/fs/buffer.c @@ -76,8 +76,7 @@ EXPORT_SYMBOL(__lock_buffer); void unlock_buffer(struct buffer_head *bh) { - smp_mb__before_clear_bit(); - clear_buffer_locked(bh); + clear_bit_unlock(BH_Lock, &bh->b_state); smp_mb__after_clear_bit(); wake_up_bit(&bh->b_state, BH_Lock); } diff --git a/include/linux/buffer_head.h b/include/linux/buffer_head.h index eadaab4..3ce64b9 100644 --- a/include/linux/buffer_head.h +++ b/include/linux/buffer_head.h @@ -322,7 +322,7 @@ static inline void wait_on_buffer(struct buffer_head *bh) static inline int trylock_buffer(struct buffer_head *bh) { - return likely(!test_and_set_bit(BH_Lock, &bh->b_state)); + return likely(!test_and_set_bit_lock(BH_Lock, &bh->b_state)); } static inline void lock_buffer(struct buffer_head *bh) |
