diff mbox series

[1/2] block: remove commented out code from diskstats_show

Message ID 20220120105248.117025-2-dwagner@suse.de (mailing list archive)
State New, archived
Headers show
Series fix crash by reading /proc/diskstats | expand

Commit Message

Daniel Wagner Jan. 20, 2022, 10:52 a.m. UTC 
The diskstats format is ABI, so we just can't add a new header. The
code snippet has been commented out since at least v2.6.12-rc2.
Remove it.

Signed-off-by: Daniel Wagner <dwagner@suse.de>
---
 block/genhd.c | 8 --------
 1 file changed, 8 deletions(-)

Comments

Hannes Reinecke Jan. 20, 2022, 11:02 a.m. UTC | #1 
On 1/20/22 11:52 AM, Daniel Wagner wrote:
> The diskstats format is ABI, so we just can't add a new header. The
> code snippet has been commented out since at least v2.6.12-rc2.
> Remove it.
> 
> Signed-off-by: Daniel Wagner <dwagner@suse.de>
> ---
>  block/genhd.c | 8 --------
>  1 file changed, 8 deletions(-)
> 
> diff --git a/block/genhd.c b/block/genhd.c
> index 626c8406f21a..c9d4386dd177 100644
> --- a/block/genhd.c
> +++ b/block/genhd.c
> @@ -1162,14 +1162,6 @@ static int diskstats_show(struct seq_file *seqf, void *v)
>  	struct disk_stats stat;
>  	unsigned long idx;
>  
> -	/*
> -	if (&disk_to_dev(gp)->kobj.entry == block_class.devices.next)
> -		seq_puts(seqf,	"major minor name"
> -				"     rio rmerge rsect ruse wio wmerge "
> -				"wsect wuse running use aveq"
> -				"\n\n");
> -	*/
> -
>  	rcu_read_lock();
>  	xa_for_each(&gp->part_tbl, idx, hd) {
>  		if (bdev_is_partition(hd) && !bdev_nr_sectors(hd))
> 
Reviewed-by: Hannes Reinecke <hare@suse.de>

Cheers,

Hannes
Daniel Wagner March 4, 2022, 3:38 p.m. UTC | #2 
On Thu, Jan 20, 2022 at 12:02:49PM +0100, Hannes Reinecke wrote:
> On 1/20/22 11:52 AM, Daniel Wagner wrote:
> > The diskstats format is ABI, so we just can't add a new header. The
> > code snippet has been commented out since at least v2.6.12-rc2.
> > Remove it.
> > > Reviewed-by: Hannes Reinecke <hare@suse.de>

Any change to queue this patch up?
diff mbox series

Patch

diff --git a/block/genhd.c b/block/genhd.c
index 626c8406f21a..c9d4386dd177 100644
--- a/block/genhd.c
+++ b/block/genhd.c
@@ -1162,14 +1162,6 @@  static int diskstats_show(struct seq_file *seqf, void *v)
 	struct disk_stats stat;
 	unsigned long idx;
 
-	/*
-	if (&disk_to_dev(gp)->kobj.entry == block_class.devices.next)
-		seq_puts(seqf,	"major minor name"
-				"     rio rmerge rsect ruse wio wmerge "
-				"wsect wuse running use aveq"
-				"\n\n");
-	*/
-
 	rcu_read_lock();
 	xa_for_each(&gp->part_tbl, idx, hd) {
 		if (bdev_is_partition(hd) && !bdev_nr_sectors(hd))