Merge branch 'sched/urgent' into sched/core, to avoid conflicts

Signed-off-by: Ingo Molnar <mingo@kernel.org>

1 files changed, 4 insertions, 4 deletions

diff --git a/drivers/block/loop.c b/drivers/block/loop.c
index c8bf270b7890..6cb1beb47c25 100644
--- a/drivers/block/loop.c
+++ b/drivers/block/loop.c
@@ -237,7 +237,7 @@ static int __do_lo_send_write(struct file *file,
         file_end_write(file);
         if (likely(bw == len))
                 return 0;
-        printk(KERN_ERR "loop: Write error at byte offset %llu, length %i.\n",
+        printk_ratelimited(KERN_ERR "loop: Write error at byte offset %llu, length %i.\n",
                         (unsigned long long)pos, len);
         if (bw >= 0)
                 bw = -EIO;
@@ -277,7 +277,7 @@ static int do_lo_send_write(struct loop_device *lo, struct bio_vec *bvec,
                 return __do_lo_send_write(lo->lo_backing_file,
                                 page_address(page), bvec->bv_len,
                                 pos);
-        printk(KERN_ERR "loop: Transfer error at byte offset %llu, "
+        printk_ratelimited(KERN_ERR "loop: Transfer error at byte offset %llu, "
                         "length %i.\n", (unsigned long long)pos, bvec->bv_len);
         if (ret > 0)
                 ret = -EIO;
@@ -316,7 +316,7 @@ static int lo_send(struct loop_device *lo, struct bio *bio, loff_t pos)
 out:
         return ret;
 fail:
-        printk(KERN_ERR "loop: Failed to allocate temporary page for write.\n");
+        printk_ratelimited(KERN_ERR "loop: Failed to allocate temporary page for write.\n");
         ret = -ENOMEM;
         goto out;
 }
@@ -345,7 +345,7 @@ lo_splice_actor(struct pipe_inode_info *pipe, struct pipe_buffer *buf,
                 size = p->bsize;
 
         if (lo_do_transfer(lo, READ, page, buf->offset, p->page, p->offset, size, IV)) {
-                printk(KERN_ERR "loop: transfer error block %ld\n",
+                printk_ratelimited(KERN_ERR "loop: transfer error block %ld\n",
                        page->index);
                 size = -EINVAL;
         }