diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-10-22 14:34:09 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-10-22 14:34:09 -0400 |
| commit | f20e3b5fe7ead0615309433260b9784d8da0bbbd (patch) | |
| tree | eabb2e47a0355ac4e8024b7087b4e7cb9f324358 /fs/buffer.c | |
| parent | bcbfe664e7af019e698cef2feb85ac2b4f1ac11d (diff) | |
| parent | f030d7b65e4e6399f23de2a41a58d1b607b6bd89 (diff) | |
Merge branch 'for-rmk' of git://git.android.com/kernel into devel
Diffstat (limited to 'fs/buffer.c')
| -rw-r--r-- | fs/buffer.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/buffer.c b/fs/buffer.c index ac78d4c19b3b..6569fda5cfed 100644 --- a/fs/buffer.c +++ b/fs/buffer.c | |||
| @@ -76,8 +76,7 @@ EXPORT_SYMBOL(__lock_buffer); | |||
| 76 | 76 | ||
| 77 | void unlock_buffer(struct buffer_head *bh) | 77 | void unlock_buffer(struct buffer_head *bh) |
| 78 | { | 78 | { |
| 79 | smp_mb__before_clear_bit(); | 79 | clear_bit_unlock(BH_Lock, &bh->b_state); |
| 80 | clear_buffer_locked(bh); | ||
| 81 | smp_mb__after_clear_bit(); | 80 | smp_mb__after_clear_bit(); |
| 82 | wake_up_bit(&bh->b_state, BH_Lock); | 81 | wake_up_bit(&bh->b_state, BH_Lock); |
| 83 | } | 82 | } |