Commit f95fe9cf authored Aug 02, 2011 by Herbert Poetzl Committed by Jens Axboe Aug 02, 2011

block/genhd.c: remove useless cast in diskstats_show()



Remove the (unsigned long long) cast in diskstats_show() and adjusts the
seq_printf() format string to 'unsigned long'

diskstats_show() uses part_stat_read() to get the stats, which either
accesses the specified field in the struct disk_stats directly (non SMP)
or sums up the per CPU values in a variable of the same type as the field,
so in any case the result will have the same type and range as the
specified field which for all disk_stats entries is unsigned long

Also, for unsigned long ranges the output of %lu should be identical to
the one of %llu, so no change in the actual proc entry contents.

Signed-off-by: Herbert Poetzl <herbert@13thfloor.at>
Cc: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Jens Axboe <jaxboe@fusionio.com>

parent aec9f377

block/genhd.c

+4 −4

Original line number	Diff line number	Diff line
		@@ -1146,17 +1146,17 @@ static int diskstats_show(struct seq_file seqf, void v)
		cpu = part_stat_lock();
		part_round_stats(cpu, hd);
		part_stat_unlock();
		seq_printf(seqf, "%4d %7d %s %lu %lu %llu "
		"%u %lu %lu %llu %u %u %u %u\n",
		seq_printf(seqf, "%4d %7d %s %lu %lu %lu "
		"%u %lu %lu %lu %u %u %u %u\n",
		MAJOR(part_devt(hd)), MINOR(part_devt(hd)),
		disk_name(gp, hd->partno, buf),
		part_stat_read(hd, ios[READ]),
		part_stat_read(hd, merges[READ]),
		(unsigned long long)part_stat_read(hd, sectors[READ]),
		part_stat_read(hd, sectors[READ]),
		jiffies_to_msecs(part_stat_read(hd, ticks[READ])),
		part_stat_read(hd, ios[WRITE]),
		part_stat_read(hd, merges[WRITE]),
		(unsigned long long)part_stat_read(hd, sectors[WRITE]),
		part_stat_read(hd, sectors[WRITE]),
		jiffies_to_msecs(part_stat_read(hd, ticks[WRITE])),
		part_in_flight(hd),
		jiffies_to_msecs(part_stat_read(hd, io_ticks)),

Admin message