[PATCH] block: Removed a warning while compiling with a cross compiler for parisc

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



I have compiled the kernel with a cross compiler "hppa-linux-gnu-" on
x86-64 host machine. I got the follwing warning:

block/genhd.c: In function ‘diskstats_show’:
block/genhd.c:1227:1: warning: the frame size of 1688 bytes is larger
than 1280 bytes [-Wframe-larger-than=]
 1227  |  }

The problem was calling seq_printf function with too long argumnets list.
Therefore, I cut it into two halves. For the second half I have defined
a function called "print_disk_stats" to print the states of the disk.

Signed-off-by: Abd-Alrhman Masalkhi <abd.masalkhi@xxxxxxxxx>
---
 block/genhd.c | 75 ++++++++++++++++++++++++++++-----------------------
 1 file changed, 41 insertions(+), 34 deletions(-)

diff --git a/block/genhd.c b/block/genhd.c
index 9f8cb7beaad1..caf5ac8b509f 100644
--- a/block/genhd.c
+++ b/block/genhd.c
@@ -1151,6 +1151,44 @@ const struct device_type disk_type = {
 };
 
 #ifdef CONFIG_PROC_FS
+
+void print_disk_stats(struct seq_file *seqf,
+		      unsigned int inflight, struct disk_stats *stat)
+{
+	seq_printf(seqf, "%lu %lu %lu %u "
+		   "%lu %lu %lu %u "
+		   "%u %u %u "
+		   "%lu %lu %lu %u "
+		   "%lu %u"
+		   "\n",
+		   stat->ios[STAT_READ],
+		   stat->merges[STAT_READ],
+		   stat->sectors[STAT_READ],
+		   (unsigned int)div_u64(stat->nsecs[STAT_READ],
+					 NSEC_PER_MSEC),
+		   stat->ios[STAT_WRITE],
+		   stat->merges[STAT_WRITE],
+		   stat->sectors[STAT_WRITE],
+		   (unsigned int)div_u64(stat->nsecs[STAT_WRITE],
+					 NSEC_PER_MSEC),
+		   inflight,
+		   jiffies_to_msecs(stat->io_ticks),
+		   (unsigned int)div_u64(stat->nsecs[STAT_READ] +
+					 stat->nsecs[STAT_WRITE] +
+					 stat->nsecs[STAT_DISCARD] +
+					 stat->nsecs[STAT_FLUSH],
+					 NSEC_PER_MSEC),
+		   stat->ios[STAT_DISCARD],
+		   stat->merges[STAT_DISCARD],
+		   stat->sectors[STAT_DISCARD],
+		   (unsigned int)div_u64(stat->nsecs[STAT_DISCARD],
+					 NSEC_PER_MSEC),
+		   stat->ios[STAT_FLUSH],
+		   (unsigned int)div_u64(stat->nsecs[STAT_FLUSH],
+					 NSEC_PER_MSEC)
+		);
+}
+
 /*
  * aggregate disk stat collector.  Uses the same stats that the sysfs
  * entries do, above, but makes them available through one seq_file.
@@ -1185,41 +1223,10 @@ static int diskstats_show(struct seq_file *seqf, void *v)
 		else
 			inflight = part_in_flight(hd);
 
-		seq_printf(seqf, "%4d %7d %s "
-			   "%lu %lu %lu %u "
-			   "%lu %lu %lu %u "
-			   "%u %u %u "
-			   "%lu %lu %lu %u "
-			   "%lu %u"
-			   "\n",
+		seq_printf(seqf, "%4d %7d %s ",
 			   MAJOR(hd->bd_dev), MINOR(hd->bd_dev),
-			   disk_name(gp, hd->bd_partno, buf),
-			   stat.ios[STAT_READ],
-			   stat.merges[STAT_READ],
-			   stat.sectors[STAT_READ],
-			   (unsigned int)div_u64(stat.nsecs[STAT_READ],
-							NSEC_PER_MSEC),
-			   stat.ios[STAT_WRITE],
-			   stat.merges[STAT_WRITE],
-			   stat.sectors[STAT_WRITE],
-			   (unsigned int)div_u64(stat.nsecs[STAT_WRITE],
-							NSEC_PER_MSEC),
-			   inflight,
-			   jiffies_to_msecs(stat.io_ticks),
-			   (unsigned int)div_u64(stat.nsecs[STAT_READ] +
-						 stat.nsecs[STAT_WRITE] +
-						 stat.nsecs[STAT_DISCARD] +
-						 stat.nsecs[STAT_FLUSH],
-							NSEC_PER_MSEC),
-			   stat.ios[STAT_DISCARD],
-			   stat.merges[STAT_DISCARD],
-			   stat.sectors[STAT_DISCARD],
-			   (unsigned int)div_u64(stat.nsecs[STAT_DISCARD],
-						 NSEC_PER_MSEC),
-			   stat.ios[STAT_FLUSH],
-			   (unsigned int)div_u64(stat.nsecs[STAT_FLUSH],
-						 NSEC_PER_MSEC)
-			);
+			   disk_name(gp, hd->bd_partno, buf));
+		print_disk_stats(seqf, inflight, &stat);
 	}
 	rcu_read_unlock();
 
-- 
2.29.0.rc1.dirty




[Index of Archives]     [Linux RAID]     [Linux SCSI]     [Linux ATA RAID]     [IDE]     [Linux Wireless]     [Linux Kernel]     [ATH6KL]     [Linux Bluetooth]     [Linux Netdev]     [Kernel Newbies]     [Security]     [Git]     [Netfilter]     [Bugtraq]     [Yosemite News]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Device Mapper]

  Powered by Linux