1 files changed, 20 insertions, 22 deletions

diff --git a/fs/buffer.c b/fs/buffer.c
index 3b12cf947aba..6f88dcc6d002 100644
--- a/fs/buffer.c
+++ b/fs/buffer.c
@@ -218,7 +218,7 @@ struct super_block *freeze_bdev(struct block_device *bdev)
         sb = get_super(bdev);
         if (sb && !(sb->s_flags & MS_RDONLY)) {
                 sb->s_frozen = SB_FREEZE_WRITE;
-                wmb();
+                smp_wmb();
 
                 sync_inodes_sb(sb, 0);
                 DQUOT_SYNC(sb);
@@ -235,7 +235,7 @@ struct super_block *freeze_bdev(struct block_device *bdev)
                 sync_inodes_sb(sb, 1);
 
                 sb->s_frozen = SB_FREEZE_TRANS;
-                wmb();
+                smp_wmb();
 
                 sync_blockdev(sb->s_bdev);
 
@@ -263,7 +263,7 @@ void thaw_bdev(struct block_device *bdev, struct super_block *sb)
                 if (sb->s_op->unlockfs)
                         sb->s_op->unlockfs(sb);
                 sb->s_frozen = SB_UNFROZEN;
-                wmb();
+                smp_wmb();
                 wake_up(&sb->s_wait_unfrozen);
                 drop_super(sb);
         }
@@ -774,15 +774,14 @@ repeat:
 /**
  * sync_mapping_buffers - write out and wait upon a mapping's "associated"
  *                        buffers
- * @buffer_mapping - the mapping which backs the buffers' data
- * @mapping - the mapping which wants those buffers written
+ * @mapping: the mapping which wants those buffers written
  *
  * Starts I/O against the buffers at mapping->private_list, and waits upon
  * that I/O.
  *
- * Basically, this is a convenience function for fsync().  @buffer_mapping is
- * the blockdev which "owns" the buffers and @mapping is a file or directory
- * which needs those buffers to be written for a successful fsync().
+ * Basically, this is a convenience function for fsync().
+ * @mapping is a file or directory which needs those buffers to be written for
+ * a successful fsync().
  */
 int sync_mapping_buffers(struct address_space *mapping)
 {
@@ -1211,7 +1210,7 @@ grow_buffers(struct block_device *bdev, sector_t block, int size)
         return 1;
 }
 
-struct buffer_head *
+static struct buffer_head *
 __getblk_slow(struct block_device *bdev, sector_t block, int size)
 {
         /* Size must be multiple of hard sectorsize */
@@ -1263,6 +1262,7 @@ __getblk_slow(struct block_device *bdev, sector_t block, int size)
 
 /**
  * mark_buffer_dirty - mark a buffer_head as needing writeout
+ * @bh: the buffer_head to mark dirty
  *
  * mark_buffer_dirty() will set the dirty bit against the buffer, then set its
  * backing page dirty, then tag the page as dirty in its address_space's radix
@@ -1501,6 +1501,7 @@ EXPORT_SYMBOL(__breadahead);
 
 /**
  *  __bread() - reads a specified block and returns the bh
+ *  @bdev: the block_device to read from
  *  @block: number of block
  *  @size: size (in bytes) to read
  * 
@@ -1808,7 +1809,6 @@ static int __block_write_full_page(struct inode *inode, struct page *page,
         } while (bh != head);
 
         do {
-                get_bh(bh);
                 if (!buffer_mapped(bh))
                         continue;
                 /*
@@ -1837,7 +1837,6 @@ static int __block_write_full_page(struct inode *inode, struct page *page,
          */
         BUG_ON(PageWriteback(page));
         set_page_writeback(page);
-        unlock_page(page);
 
         do {
                 struct buffer_head *next = bh->b_this_page;
@@ -1845,9 +1844,9 @@ static int __block_write_full_page(struct inode *inode, struct page *page,
                         submit_bh(WRITE, bh);
                         nr_underway++;
                 }
-                put_bh(bh);
                 bh = next;
         } while (bh != head);
+        unlock_page(page);
 
         err = 0;
 done:
@@ -1886,7 +1885,6 @@ recover:
         bh = head;
         /* Recovery: lock and submit the mapped buffers */
         do {
-                get_bh(bh);
                 if (buffer_mapped(bh) && buffer_dirty(bh)) {
                         lock_buffer(bh);
                         mark_buffer_async_write(bh);
@@ -1909,7 +1907,6 @@ recover:
                         submit_bh(WRITE, bh);
                         nr_underway++;
                 }
-                put_bh(bh);
                 bh = next;
         } while (bh != head);
         goto done;
@@ -1952,7 +1949,7 @@ static int __block_prepare_write(struct inode *inode, struct page *page,
                 if (!buffer_mapped(bh)) {
                         err = get_block(inode, block, bh, 1);
                         if (err)
-                                goto out;
+                                break;
                         if (buffer_new(bh)) {
                                 clear_buffer_new(bh);
                                 unmap_underlying_metadata(bh->b_bdev,
@@ -1994,10 +1991,12 @@ static int __block_prepare_write(struct inode *inode, struct page *page,
         while(wait_bh > wait) {
                 wait_on_buffer(*--wait_bh);
                 if (!buffer_uptodate(*wait_bh))
-                        return -EIO;
+                        err = -EIO;
         }
-        return 0;
-out:
+        if (!err)
+                return err;
+
+        /* Error case: */
         /*
          * Zero out any newly allocated blocks to avoid exposing stale
          * data.  If BH_New is set, we know that the block was newly
@@ -2078,8 +2077,7 @@ int block_read_full_page(struct page *page, get_block_t *get_block)
         int nr, i;
         int fully_mapped = 1;
 
-        if (!PageLocked(page))
-                PAGE_BUG(page);
+        BUG_ON(!PageLocked(page));
         blocksize = 1 << inode->i_blkbits;
         if (!page_has_buffers(page))
                 create_empty_buffers(page, blocksize, 0);
@@ -2917,7 +2915,7 @@ drop_buffers(struct page *page, struct buffer_head **buffers_to_free)
 
         bh = head;
         do {
-                if (buffer_write_io_error(bh))
+                if (buffer_write_io_error(bh) && page->mapping)
                         set_bit(AS_EIO, &page->mapping->flags);
                 if (buffer_busy(bh))
                         goto failed;
@@ -3115,7 +3113,7 @@ void __init buffer_init(void)
 
         bh_cachep = kmem_cache_create("buffer_head",
                         sizeof(struct buffer_head), 0,
-                        SLAB_PANIC, init_buffer_head, NULL);
+                        SLAB_RECLAIM_ACCOUNT|SLAB_PANIC, init_buffer_head, NULL);
 
         /*
          * Limit the bh occupancy to 10% of ZONE_NORMAL