drivers/md/raid5.c: fix printk warnings (9ea85eba) · Commits · 戴 / test

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:

Andrew Morton <akpm@linux-foundation.org> Signed-off-by:

Linus Torvalds <torvalds@linux-foundation.org>

drivers/md/raid5.c

+3 −3

Original line number	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;
		printk(KERN_INFO "raid5:%s: read error corrected (%lu sectors at %llu on %s)\n",
		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));
		clear_bit(R5_ReadError, &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)
		printk(KERN_WARNING "raid5:%s: read error not correctable (sector %llu on %s).\n",
		mdname(conf->mddev),
		(unsigned long long)sh->sector + rdev->data_offset,
		(unsigned long long)(sh->sector + rdev->data_offset),
		bdn);
		else if (test_bit(R5_ReWrite, &sh->dev[i].flags))
		/* Oh, no!!! */
		printk(KERN_WARNING "raid5:%s: read error NOT corrected!! (sector %llu on %s).\n",
		mdname(conf->mddev),
		(unsigned long long)sh->sector + rdev->data_offset,
		(unsigned long long)(sh->sector + rdev->data_offset),
		bdn);
		else if (atomic_read(&rdev->read_errors)
		> conf->max_nr_stripes)

Admin message