Merge branch 'next' into for-linus

1 files changed, 7 insertions, 4 deletions

diff --git a/fs/buffer.c b/fs/buffer.c
index 1a80b048ade8..19d8eb7fdc81 100644
--- a/fs/buffer.c
+++ b/fs/buffer.c
@@ -213,13 +213,16 @@ __find_get_block_slow(struct block_device *bdev, sector_t block)
          * elsewhere, don't buffer_error if we had some unmapped buffers
          */
         if (all_mapped) {
+                char b[BDEVNAME_SIZE];
+
                 printk("__find_get_block_slow() failed. "
                         "block=%llu, b_blocknr=%llu\n",
                         (unsigned long long)block,
                         (unsigned long long)bh->b_blocknr);
                 printk("b_state=0x%08lx, b_size=%zu\n",
                         bh->b_state, bh->b_size);
-                printk("device blocksize: %d\n", 1 << bd_inode->i_blkbits);
+                printk("device %s blocksize: %d\n", bdevname(bdev, b),
+                        1 << bd_inode->i_blkbits);
         }
 out_unlock:
         spin_unlock(&bd_mapping->private_lock);
@@ -285,7 +288,7 @@ static void free_more_memory(void)
         struct zone *zone;
         int nid;
 
-        wakeup_flusher_threads(1024);
+        wakeup_flusher_threads(1024, WB_REASON_FREE_MORE_MEM);
         yield();
 
         for_each_online_node(nid) {
@@ -1470,13 +1473,13 @@ static void discard_buffer(struct buffer_head * bh)
 }
 
 /**
- * block_invalidatepage - invalidate part of all of a buffer-backed page
+ * block_invalidatepage - invalidate part or all of a buffer-backed page
  *
  * @page: the page which is affected
  * @offset: the index of the truncation point
  *
  * block_invalidatepage() is called when all or part of the page has become
- * invalidatedby a truncate operation.
+ * invalidated by a truncate operation.
  *
  * block_invalidatepage() does not have to release all buffers, but it must
  * ensure that no dirty buffer is left outside @offset and that no I/O