1 files changed, 2 insertions, 1 deletions

diff --git a/fs/buffer.c b/fs/buffer.c
index 1ad674fd348c..7ff6e9346fae 100644
--- a/fs/buffer.c
+++ b/fs/buffer.c
@@ -78,6 +78,7 @@ EXPORT_SYMBOL(__lock_buffer);
 
 void fastcall unlock_buffer(struct buffer_head *bh)
 {
+        smp_mb__before_clear_bit();
         clear_buffer_locked(bh);
         smp_mb__after_clear_bit();
         wake_up_bit(&bh->b_state, BH_Lock);
@@ -345,7 +346,7 @@ void invalidate_bdev(struct block_device *bdev, int destroy_dirty_buffers)
          * We really want to use invalidate_inode_pages2() for
          * that, but not until that's cleaned up.
          */
-        invalidate_inode_pages(mapping);
+        invalidate_mapping_pages(mapping, 0, -1);
 }
 
 /*