Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 27f30251 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

block: make /proc/partitions and /proc/diskstats use class_find_device() 



Use the proper class iterator function instead of mucking around in the
internals of the class structures.

Cc: Kay Sievers <kay.sievers@vrfy.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 66c64afe

block/genhd.c

+13 −12
Original line number Diff line number Diff line
@@ -317,17 +317,21 @@ static void *part_start(struct seq_file *part, loff_t *pos) 
	return NULL;

}



static int find_next(struct device *dev, void *data)

{

	if (dev->type == &disk_type)

		return 1;

	return 0;

}



static void *part_next(struct seq_file *part, void *v, loff_t *pos)

{

	struct gendisk *gp = v;

	struct device *dev;

	++*pos;

	list_for_each_entry(dev, &gp->dev.node, node) {

		if (&dev->node == &block_class.devices)

			return NULL;

		if (dev->type == &disk_type)

	dev = class_find_device(&block_class, &gp->dev, NULL, find_next);

	if (dev)

		return dev_to_disk(dev);

	}

	return NULL;

}
@@ -578,12 +582,9 @@ static void *diskstats_next(struct seq_file *part, void *v, loff_t *pos) 
	struct device *dev;



	++*pos;

	list_for_each_entry(dev, &gp->dev.node, node) {

		if (&dev->node == &block_class.devices)

			return NULL;

		if (dev->type == &disk_type)

	dev = class_find_device(&block_class, &gp->dev, NULL, find_next);

	if (dev)

		return dev_to_disk(dev);

	}

	return NULL;

}