Commit 8bda470e authored by Christian Dietrich's avatar Christian Dietrich Committed by NeilBrown
Browse files

md/raid: use printk_ratelimited instead of printk_ratelimit 



As per printk_ratelimit comment, it should not be used.

Signed-off-by: default avatarChristian Dietrich <christian.dietrich@informatik.uni-erlangen.de>
Signed-off-by: default avatarNeilBrown <neilb@suse.de>
parent a0a02a7a

drivers/md/raid1.c

+15 −10
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ 
#include <linux/delay.h>

#include <linux/blkdev.h>

#include <linux/seq_file.h>

#include <linux/ratelimit.h>

#include "md.h"

#include "raid1.h"

#include "bitmap.h"
@@ -287,10 +288,13 @@ static void raid1_end_read_request(struct bio *bio, int error) 
		 * oops, read error:

		 */

		char b[BDEVNAME_SIZE];

		if (printk_ratelimit())

			printk(KERN_ERR "md/raid1:%s: %s: rescheduling sector %llu\n",

		printk_ratelimited(

			KERN_ERR "md/raid1:%s: %s: "

			"rescheduling sector %llu\n",

			mdname(conf->mddev),

			       bdevname(conf->mirrors[mirror].rdev->bdev,b), (unsigned long long)r1_bio->sector);

			bdevname(conf->mirrors[mirror].rdev->bdev,

				 b),

			(unsigned long long)r1_bio->sector);

		reschedule_retry(r1_bio);

	}
@@ -1580,9 +1584,10 @@ static void raid1d(mddev_t *mddev) 
						      GFP_NOIO, mddev);

				r1_bio->bios[r1_bio->read_disk] = bio;

				rdev = conf->mirrors[disk].rdev;

				if (printk_ratelimit())

					printk(KERN_ERR "md/raid1:%s: redirecting sector %llu to"

					       " other mirror: %s\n",

				printk_ratelimited(

					KERN_ERR

					"md/raid1:%s: redirecting sector %llu"

					" to other mirror: %s\n",

					mdname(mddev),

					(unsigned long long)r1_bio->sector,

					bdevname(rdev->bdev, b));

drivers/md/raid10.c

+13 −10
Original line number Diff line number Diff line
@@ -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",

		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);

				   bdevname(conf->mirrors[dev].rdev->bdev, b),

				   (unsigned long long)r10_bio->sector);

		reschedule_retry(r10_bio);

	}

}
@@ -1669,9 +1671,10 @@ 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",

				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);

drivers/md/raid5.c

+25 −22
Original line number Diff line number Diff line
@@ -51,6 +51,7 @@ 
#include <linux/seq_file.h>

#include <linux/cpu.h>

#include <linux/slab.h>

#include <linux/ratelimit.h>

#include "md.h"

#include "raid5.h"

#include "raid0.h"
@@ -96,8 +97,6 @@ 
#define __inline__

#endif



#define printk_rl(args...) ((void) (printk_ratelimit() && printk(args)))



/*

 * We maintain a biased count of active stripes in the bottom 16 bits of

 * bi_phys_segments, and a count of processed stripes in the upper 16 bits
@@ -1583,7 +1582,9 @@ static void raid5_end_read_request(struct bio * bi, int error) 
		set_bit(R5_UPTODATE, &sh->dev[i].flags);

		if (test_bit(R5_ReadError, &sh->dev[i].flags)) {

			rdev = conf->disks[i].rdev;

			printk_rl(KERN_INFO "md/raid:%s: read error corrected"

			printk_ratelimited(

				KERN_INFO

				"md/raid:%s: read error corrected"

				" (%lu sectors at %llu on %s)\n",

				mdname(conf->mddev), STRIPE_SECTORS,

				(unsigned long long)(sh->sector
@@ -1602,7 +1603,8 @@ static void raid5_end_read_request(struct bio * bi, int error) 
		clear_bit(R5_UPTODATE, &sh->dev[i].flags);

		atomic_inc(&rdev->read_errors);

		if (conf->mddev->degraded >= conf->max_degraded)

			printk_rl(KERN_WARNING

			printk_ratelimited(

				KERN_WARNING

				"md/raid:%s: read error not correctable "

				"(sector %llu on %s).\n",

				mdname(conf->mddev),
@@ -1611,7 +1613,8 @@ static void raid5_end_read_request(struct bio * bi, int error) 
				bdn);

		else if (test_bit(R5_ReWrite, &sh->dev[i].flags))

			/* Oh, no!!! */

			printk_rl(KERN_WARNING

			printk_ratelimited(

				KERN_WARNING

				"md/raid:%s: read error NOT corrected!! "

				"(sector %llu on %s).\n",

				mdname(conf->mddev),