md/raid: use printk_ratelimited instead of printk_ratelimit

As per printk_ratelimit comment, it should not be used.

Signed-off-by: Christian Dietrich <christian.dietrich@informatik.uni-erlangen.de>
Signed-off-by: NeilBrown <neilb@suse.de>

1 files changed, 13 insertions, 10 deletions

diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c
index 3715e220e5e0..1725ec1e1e82 100644
--- a/drivers/md/raid10.c
+++ b/drivers/md/raid10.c
@@ -22,6 +22,7 @@
 #include <linux/delay.h>
 #include <linux/blkdev.h>
 #include <linux/seq_file.h>
+#include <linux/ratelimit.h>
 #include "md.h"
 #include "raid10.h"
 #include "raid0.h"
@@ -301,10 +302,11 @@ static void raid10_end_read_request(struct bio *bio, int error)
                  * oops, read error - keep the refcount on the rdev
                  */
                 char b[BDEVNAME_SIZE];
-                if (printk_ratelimit())
-                        printk(KERN_ERR "md/raid10:%s: %s: rescheduling sector %llu\n",
-                               mdname(conf->mddev),
-                               bdevname(conf->mirrors[dev].rdev->bdev,b), (unsigned long long)r10_bio->sector);
+                printk_ratelimited(KERN_ERR
+                                   "md/raid10:%s: %s: rescheduling sector %llu\n",
+                                   mdname(conf->mddev),
+                                   bdevname(conf->mirrors[dev].rdev->bdev, b),
+                                   (unsigned long long)r10_bio->sector);
                 reschedule_retry(r10_bio);
         }
 }
@@ -1669,12 +1671,13 @@ static void raid10d(mddev_t *mddev)
                                 bio_put(bio);
                                 slot = r10_bio->read_slot;
                                 rdev = conf->mirrors[mirror].rdev;
-                                if (printk_ratelimit())
-                                        printk(KERN_ERR "md/raid10:%s: %s: redirecting sector %llu to"
-                                               " another mirror\n",
-                                               mdname(mddev),
-                                               bdevname(rdev->bdev,b),
-                                               (unsigned long long)r10_bio->sector);
+                                printk_ratelimited(
+                                        KERN_ERR
+                                        "md/raid10:%s: %s: redirecting"
+                                        "sector %llu to another mirror\n",
+                                        mdname(mddev),
+                                        bdevname(rdev->bdev, b),
+                                        (unsigned long long)r10_bio->sector);
                                 bio = bio_clone_mddev(r10_bio->master_bio,
                                                       GFP_NOIO, mddev);
                                 r10_bio->devs[slot].bio = bio;