From 5c642f654480537c4d61c0c26229c0efc1f666bb Mon Sep 17 00:00:00 2001 From: Nick Piggin Date: Sat, 18 Oct 2008 20:27:00 -0700 Subject: [PATCH] --- yaml --- r: 115865 b: refs/heads/master c: 51b07fc3c5c830bb49c80fc5eac041e1f66a72e7 h: refs/heads/master i: 115863: 54c5a8d9ab98119f58baf274e773bd89345ebb6d v: v3 --- [refs] | 2 +- trunk/fs/buffer.c | 3 +-- trunk/include/linux/buffer_head.h | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index dc12116acc43..4254ddaffff3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8413ac9d8c9a1366a4f57880723126cd24e5a5c3 +refs/heads/master: 51b07fc3c5c830bb49c80fc5eac041e1f66a72e7 diff --git a/trunk/fs/buffer.c b/trunk/fs/buffer.c index ac78d4c19b3b..6569fda5cfed 100644 --- a/trunk/fs/buffer.c +++ b/trunk/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/trunk/include/linux/buffer_head.h b/trunk/include/linux/buffer_head.h index eadaab44015f..3ce64b90118c 100644 --- a/trunk/include/linux/buffer_head.h +++ b/trunk/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)