From 3d0cadd4af8980b1afd9f4bd0d3b8fdea009da18 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Thu, 22 May 2008 17:21:08 -0400 Subject: [PATCH] --- yaml --- r: 104749 b: refs/heads/master c: 66c64afec16a7b46212ecb2fa99998923bbeea3f h: refs/heads/master i: 104747: 8861d60e0c187da3c1a0ef28f834cfe6b94abaab v: v3 --- [refs] | 2 +- trunk/block/genhd.c | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index cc510626b27f..c6af5c0be60d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 68c4d4a7875c59f2e4b72901ab11ba978e75bde0 +refs/heads/master: 66c64afec16a7b46212ecb2fa99998923bbeea3f diff --git a/trunk/block/genhd.c b/trunk/block/genhd.c index f03bdadc52ac..70f1d7075783 100644 --- a/trunk/block/genhd.c +++ b/trunk/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)))