diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2008-11-24 13:54:37 -0500 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2008-11-24 13:54:37 -0500 |
| commit | 3e1d7a6219ab64e13b10b1a77c0625db9a8bd8db (patch) | |
| tree | c682da7317845d7b1336e3d8498cf83bdf8f5900 /fs/buffer.c | |
| parent | 42569c39917a08e8de1e8b5685463be7b74baebd (diff) | |
| parent | 13d428afc007fcfcd6deeb215618f54cf9c0cae6 (diff) | |
Merge branch 'linus' into core/futexes
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 | } |