]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
block: fix duplicate headers for /proc/partitions
authorTejun Heo <tj@kernel.org>
Thu, 4 Sep 2008 07:17:31 +0000 (09:17 +0200)
committerJens Axboe <jens.axboe@oracle.com>
Thu, 9 Oct 2008 06:56:12 +0000 (08:56 +0200)
seqf can be started multiple times for a read and the header should be
printed only for the initial one.  Fix it.

Signed-off-by: Tejun Heo <tj@kernel.org>
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
block/genhd.c

index ed926b760ca002ad7821bf3acac9222e3ea2c838..8acaff0154e3e3aa913bc639c05ef3146a95862c 100644 (file)
@@ -697,7 +697,7 @@ static void *show_partition_start(struct seq_file *seqf, loff_t *pos)
        static void *p;
 
        p = disk_seqf_start(seqf, pos);
-       if (!IS_ERR(p) && p)
+       if (!IS_ERR(p) && p && !*pos)
                seq_puts(seqf, "major minor  #blocks  name\n\n");
        return p;
 }