1 files changed, 11 insertions, 14 deletions

diff --git a/fs/buffer.c b/fs/buffer.c
index 6fa530256bfd..416a2686ec66 100644
--- a/fs/buffer.c
+++ b/fs/buffer.c
@@ -40,7 +40,6 @@
 #include <linux/cpu.h>
 #include <linux/bitops.h>
 #include <linux/mpage.h>
-#include <linux/bit_spinlock.h>
 
 static int fsync_buffers_list(spinlock_t *lock, struct list_head *list);
 
@@ -330,8 +329,7 @@ static void end_buffer_async_read(struct buffer_head *bh, int uptodate)
          * decide that the page is now completely done.
          */
         first = page_buffers(page);
-        local_irq_save(flags);
-        bit_spin_lock(BH_Uptodate_Lock, &first->b_state);
+        spin_lock_irqsave(&first->b_uptodate_lock, flags);
         clear_buffer_async_read(bh);
         unlock_buffer(bh);
         tmp = bh;
@@ -344,8 +342,7 @@ static void end_buffer_async_read(struct buffer_head *bh, int uptodate)
                 }
                 tmp = tmp->b_this_page;
         } while (tmp != bh);
-        bit_spin_unlock(BH_Uptodate_Lock, &first->b_state);
-        local_irq_restore(flags);
+        spin_unlock_irqrestore(&first->b_uptodate_lock, flags);
 
         /*
          * If none of the buffers had errors and they are all
@@ -357,8 +354,7 @@ static void end_buffer_async_read(struct buffer_head *bh, int uptodate)
         return;
 
 still_busy:
-        bit_spin_unlock(BH_Uptodate_Lock, &first->b_state);
-        local_irq_restore(flags);
+        spin_unlock_irqrestore(&first->b_uptodate_lock, flags);
         return;
 }
 
@@ -393,8 +389,7 @@ void end_buffer_async_write(struct buffer_head *bh, int uptodate)
         }
 
         first = page_buffers(page);
-        local_irq_save(flags);
-        bit_spin_lock(BH_Uptodate_Lock, &first->b_state);
+        spin_lock_irqsave(&first->b_uptodate_lock, flags);
 
         clear_buffer_async_write(bh);
         unlock_buffer(bh);
@@ -406,14 +401,12 @@ void end_buffer_async_write(struct buffer_head *bh, int uptodate)
                 }
                 tmp = tmp->b_this_page;
         }
-        bit_spin_unlock(BH_Uptodate_Lock, &first->b_state);
-        local_irq_restore(flags);
+        spin_unlock_irqrestore(&first->b_uptodate_lock, flags);
         end_page_writeback(page);
         return;
 
 still_busy:
-        bit_spin_unlock(BH_Uptodate_Lock, &first->b_state);
-        local_irq_restore(flags);
+        spin_unlock_irqrestore(&first->b_uptodate_lock, flags);
         return;
 }
 EXPORT_SYMBOL(end_buffer_async_write);
@@ -1152,7 +1145,7 @@ __getblk_slow(struct block_device *bdev, sector_t block, int size)
  * inode list.
  *
  * mark_buffer_dirty() is atomic.  It takes bh->b_page->mapping->private_lock,
- * mapping->tree_lock and the global inode_lock.
+ * and mapping->tree_lock.
  */
 void mark_buffer_dirty(struct buffer_head *bh)
 {
@@ -3268,6 +3261,8 @@ struct buffer_head *alloc_buffer_head(gfp_t gfp_flags)
         struct buffer_head *ret = kmem_cache_alloc(bh_cachep, gfp_flags);
         if (ret) {
                 INIT_LIST_HEAD(&ret->b_assoc_buffers);
+                spin_lock_init(&ret->b_uptodate_lock);
+                spin_lock_init(&ret->b_state_lock);
                 get_cpu_var(bh_accounting).nr++;
                 recalc_bh_state();
                 put_cpu_var(bh_accounting);
@@ -3279,6 +3274,8 @@ EXPORT_SYMBOL(alloc_buffer_head);
 void free_buffer_head(struct buffer_head *bh)
 {
         BUG_ON(!list_empty(&bh->b_assoc_buffers));
+        BUG_ON(spin_is_locked(&bh->b_uptodate_lock));
+        BUG_ON(spin_is_locked(&bh->b_state_lock));
         kmem_cache_free(bh_cachep, bh);
         get_cpu_var(bh_accounting).nr--;
         recalc_bh_state();