adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-28 03:36:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

block: make proc files seq_start use the class_find_device()

Browse source 
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: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Greg Kroah-Hartman 2008-05-22 17:21:08 -04:00
parent a6e2ba8877
commit 68c4d4a787
1 changed files with 17 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
block/genhd.c
View file

@ -291,18 +291,25 @@ void __init printk_all_partitions(void)
#ifdef CONFIG_PROC_FS
/* iterator */
static int find_start(struct device *dev, void *data)
{
loff_t k = *(loff_t *)data;
if (dev->type != &disk_type)
return 0;
if (!k--)
return 1;
return 0;
}
static void *part_start(struct seq_file *part, loff_t *pos)
{
loff_t k = *pos;
struct device *dev;
mutex_lock(&block_class_lock);
list_for_each_entry(dev, &block_class.devices, node) {
if (dev->type != &disk_type)
continue;
if (!k--)
return dev_to_disk(dev);
}
dev = class_find_device(&block_class, NULL, (void *)pos, find_start);
if (dev)
return dev_to_disk(dev);
return NULL;
}
@ -555,16 +562,12 @@ static struct device_type disk_type = {
static void *diskstats_start(struct seq_file *part, loff_t *pos)
{
loff_t k = *pos;
struct device *dev;
mutex_lock(&block_class_lock);
list_for_each_entry(dev, &block_class.devices, node) {
if (dev->type != &disk_type)
continue;
if (!k--)
return dev_to_disk(dev);
}
dev = class_find_device(&block_class, NULL, (void *)pos, find_start);
if (dev)
return dev_to_disk(dev);
return NULL;
}