diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2008-05-22 23:21:08 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2008-07-22 06:54:49 +0200 |
| commit | 66c64afec16a7b46212ecb2fa99998923bbeea3f (patch) | |
| tree | 732d5a400af672568ddceea738d6c509f1f3a0be | |
| parent | block: make proc files seq_start use the class_find_device() (diff) | |
| download | linux-66c64afec16a7b46212ecb2fa99998923bbeea3f.tar.xz linux-66c64afec16a7b46212ecb2fa99998923bbeea3f.zip | |
block: move header for /proc/partitions to seq_start
The seq_start call is the better place for the header for the file, that
way we don't have to be mucking in the class structure to try to figure
out if this is the first partition or not.
Cc: Kay Sievers <kay.sievers@vrfy.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| -rw-r--r-- | block/genhd.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/block/genhd.c b/block/genhd.c index f03bdadc52ac..70f1d7075783 100644 --- a/block/genhd.c +++ b/block/genhd.c @@ -305,6 +305,10 @@ static int find_start(struct device *dev, void *data) static void *part_start(struct seq_file *part, loff_t *pos) { struct device *dev; + loff_t n = *pos; + + if (!n) + seq_puts(part, "major minor #blocks name\n\n"); mutex_lock(&block_class_lock); dev = class_find_device(&block_class, NULL, (void *)pos, find_start); @@ -338,9 +342,6 @@ static int show_partition(struct seq_file *part, void *v) int n; char buf[BDEVNAME_SIZE]; - if (&sgp->dev.node == block_class.devices.next) - seq_puts(part, "major minor #blocks name\n\n"); - /* Don't show non-partitionable removeable devices or empty devices */ if (!get_capacity(sgp) || (sgp->minors == 1 && (sgp->flags & GENHD_FL_REMOVABLE))) |