aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2008-05-22 17:21:08 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2008-07-22 00:54:49 -0400
commit66c64afec16a7b46212ecb2fa99998923bbeea3f (patch)
tree732d5a400af672568ddceea738d6c509f1f3a0be
parent68c4d4a7875c59f2e4b72901ab11ba978e75bde0 (diff)
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.c7
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)
305static void *part_start(struct seq_file *part, loff_t *pos) 305static void *part_start(struct seq_file *part, loff_t *pos)
306{ 306{
307 struct device *dev; 307 struct device *dev;
308 loff_t n = *pos;
309
310 if (!n)
311 seq_puts(part, "major minor #blocks name\n\n");
308 312
309 mutex_lock(&block_class_lock); 313 mutex_lock(&block_class_lock);
310 dev = class_find_device(&block_class, NULL, (void *)pos, find_start); 314 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)
338 int n; 342 int n;
339 char buf[BDEVNAME_SIZE]; 343 char buf[BDEVNAME_SIZE];
340 344
341 if (&sgp->dev.node == block_class.devices.next)
342 seq_puts(part, "major minor #blocks name\n\n");
343
344 /* Don't show non-partitionable removeable devices or empty devices */ 345 /* Don't show non-partitionable removeable devices or empty devices */
345 if (!get_capacity(sgp) || 346 if (!get_capacity(sgp) ||
346 (sgp->minors == 1 && (sgp->flags & GENHD_FL_REMOVABLE))) 347 (sgp->minors == 1 && (sgp->flags & GENHD_FL_REMOVABLE)))