Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9ea85eba authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds
Browse files

drivers/md/raid5.c: fix printk warnings 



gcc-3.4.5 on sparc64:

drivers/md/raid5.c: In function `raid5_end_read_request':
drivers/md/raid5.c:1147: warning: long long unsigned int format, long unsigned int arg (arg 4)
drivers/md/raid5.c:1164: warning: long long unsigned int format, long unsigned int arg (arg 3)
drivers/md/raid5.c:1170: warning: long long unsigned int format, long unsigned int arg (arg 3)

sector_t is u64, and we don't know what type the architecture uses to
implement u64 (on some it is unsigned long).

Cc: Neil Brown <neilb@suse.de>
Cc: "J. Bruce Fields" <bfields@fieldses.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 8195096b

drivers/md/raid5.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -1143,7 +1143,7 @@ static void raid5_end_read_request(struct bio * bi, int error) 
			rdev = conf->disks[i].rdev;

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

			printk(KERN_INFO "raid5:%s: read error corrected (%lu sectors at %llu on %s)\n",

			printk(KERN_INFO "raid5:%s: read error corrected (%lu sectors at %llu on %s)\n",

			       mdname(conf->mddev), STRIPE_SECTORS,

			       mdname(conf->mddev), STRIPE_SECTORS,

			       (unsigned long long)sh->sector + rdev->data_offset,

			       (unsigned long long)(sh->sector + rdev->data_offset),

			       bdevname(rdev->bdev, b));

			       bdevname(rdev->bdev, b));

			clear_bit(R5_ReadError, &sh->dev[i].flags);

			clear_bit(R5_ReadError, &sh->dev[i].flags);

			clear_bit(R5_ReWrite, &sh->dev[i].flags);

			clear_bit(R5_ReWrite, &sh->dev[i].flags);
@@ -1160,13 +1160,13 @@ static void raid5_end_read_request(struct bio * bi, int error) 
		if (conf->mddev->degraded)

		if (conf->mddev->degraded)

			printk(KERN_WARNING "raid5:%s: read error not correctable (sector %llu on %s).\n",

			printk(KERN_WARNING "raid5:%s: read error not correctable (sector %llu on %s).\n",

			       mdname(conf->mddev),

			       mdname(conf->mddev),

			       (unsigned long long)sh->sector + rdev->data_offset,

			       (unsigned long long)(sh->sector + rdev->data_offset),

			       bdn);

			       bdn);

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

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

			/* Oh, no!!! */

			/* Oh, no!!! */

			printk(KERN_WARNING "raid5:%s: read error NOT corrected!! (sector %llu on %s).\n",

			printk(KERN_WARNING "raid5:%s: read error NOT corrected!! (sector %llu on %s).\n",

			       mdname(conf->mddev),

			       mdname(conf->mddev),

			       (unsigned long long)sh->sector + rdev->data_offset,

			       (unsigned long long)(sh->sector + rdev->data_offset),

			       bdn);

			       bdn);

		else if (atomic_read(&rdev->read_errors)

		else if (atomic_read(&rdev->read_errors)

			 > conf->max_nr_stripes)

			 > conf->max_nr_stripes)