lists.openwall.net   lists  /  announce  owl-users  owl-dev  john-users  john-dev  passwdqc-users  yescrypt  popa3d-users  /  oss-security  kernel-hardening  musl  sabotage  tlsify  passwords  /  crypt-dev  xvendor  /  Bugtraq  Full-Disclosure  linux-kernel  linux-netdev  linux-ext4  linux-hardening  linux-cve-announce  PHC 
Open Source and information security mailing list archives
 
Hash Suite: Windows password security audit tool. GUI, reports in PDF.
[<prev] [next>] [day] [month] [year] [list]
Message-ID: <20110613111550.GD30072@MAIL.13thfloor.at>
Date:	Mon, 13 Jun 2011 13:15:50 +0200
From:	Herbert Poetzl <herbert@...hfloor.at>
To:	Linux Kernel ML <linux-kernel@...r.kernel.org>
Subject: [PATCH] genhd: remove useless cast in diskstats_show()


This patch removes 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

best,
Herbert

Signed-off-by: Herbert Poetzl <herbert@...hfloor.at>
--- linux/block/genhd.c	2011-06-09 15:16:17.000000000 +0200
+++ linux/block/genhd.c	2011-06-13 13:05:56.000000000 +0200
@@ -1154,17 +1154,17 @@ static int diskstats_show(struct seq_fil
 		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)),

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Powered by blists - more mailing lists

Powered by Openwall GNU/*/Linux Powered by OpenVZ