Merge tag 'v5.0-rc6' into for-5.1/block

Pull in 5.0-rc6 to avoid a dumb merge conflict with fs/iomap.c.
This is needed since io_uring is now based on the block branch,
to avoid a conflict between the multi-page bvecs and the bits
of io_uring that touch the core block parts.

* tag 'v5.0-rc6': (525 commits)
  Linux 5.0-rc6
  x86/mm: Make set_pmd_at() paravirt aware
  MAINTAINERS: Update the ocores i2c bus driver maintainer, etc
  blk-mq: remove duplicated definition of blk_mq_freeze_queue
  Blk-iolatency: warn on negative inflight IO counter
  blk-iolatency: fix IO hang due to negative inflight counter
  MAINTAINERS: unify reference to xen-devel list
  x86/mm/cpa: Fix set_mce_nospec()
  futex: Handle early deadlock return correctly
  futex: Fix barrier comment
  net: dsa: b53: Fix for failure when irq is not defined in dt
  blktrace: Show requests without sector
  mips: cm: reprime error cause
  mips: loongson64: remove unreachable(), fix loongson_poweroff().
  sit: check if IPv6 enabled before calling ip6_err_gen_icmpv6_unreach()
  geneve: should not call rt6_lookup() when ipv6 was disabled
  KVM: nVMX: unconditionally cancel preemption timer in free_nested (CVE-2019-7221)
  KVM: x86: work around leak of uninitialized stack contents (CVE-2019-7222)
  kvm: fix kvm_ioctl_create_device() reference counting (CVE-2019-6974)
  signal: Better detection of synchronous signals
  ...

1 files changed, 10 insertions, 9 deletions

diff --git a/fs/buffer.c b/fs/buffer.c
index 817871274c77..89a4e42b9aad 100644
--- a/fs/buffer.c
+++ b/fs/buffer.c
@@ -200,6 +200,7 @@ __find_get_block_slow(struct block_device *bdev, sector_t block)
         struct buffer_head *head;
         struct page *page;
         int all_mapped = 1;
+        static DEFINE_RATELIMIT_STATE(last_warned, HZ, 1);
 
         index = block >> (PAGE_SHIFT - bd_inode->i_blkbits);
         page = find_get_page_flags(bd_mapping, index, FGP_ACCESSED);
@@ -227,15 +228,15 @@ __find_get_block_slow(struct block_device *bdev, sector_t block)
          * file io on the block device and getblk.  It gets dealt with
          * elsewhere, don't buffer_error if we had some unmapped buffers
          */
-        if (all_mapped) {
-                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 %pg blocksize: %d\n", bdev,
-                        1 << bd_inode->i_blkbits);
+        ratelimit_set_flags(&last_warned, RATELIMIT_MSG_ON_RELEASE);
+        if (all_mapped && __ratelimit(&last_warned)) {
+                printk("__find_get_block_slow() failed. block=%llu, "
+                       "b_blocknr=%llu, b_state=0x%08lx, b_size=%zu, "
+                       "device %pg blocksize: %d\n",
+                       (unsigned long long)block,
+                       (unsigned long long)bh->b_blocknr,
+                       bh->b_state, bh->b_size, bdev,
+                       1 << bd_inode->i_blkbits);
         }
 out_unlock:
         spin_unlock(&bd_mapping->private_lock);