Skip to content

Commit

Permalink
block: move header for /proc/partitions to seq_start
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
gregkh committed Jul 22, 2008
1 parent 68c4d4a commit 66c64af
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions block/genhd.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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)))
Expand Down

0 comments on commit 66c64af

Please sign in to comment.