From fd6e24c58a77907dc6e6252c375978684553bec1 Mon Sep 17 00:00:00 2001 From: Robert Rosengren Date: Mon, 6 Dec 2010 13:58:42 +0100 Subject: fs/partitions: Adapt blkdevparts to new interface fs/partitions: Adapt blkdevparts to new interface of kernel 2.6.35 ST-Ericsson ID: ER282603 ST-Ericsson FOSS-OUT ID: Trivial Change-Id: I95fccf7f47fd5e4f716b6a0e6fec001d2c9428cf Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/10308 Tested-by: Robert ROSENGREN Reviewed-by: Ulf HANSSON Reviewed-by: Sebastian RASMUSSEN --- fs/partitions/blkdev_parts.c | 4 ++-- fs/partitions/blkdev_parts.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'fs') diff --git a/fs/partitions/blkdev_parts.c b/fs/partitions/blkdev_parts.c index 48f4136d720..030565b7ce7 100755 --- a/fs/partitions/blkdev_parts.c +++ b/fs/partitions/blkdev_parts.c @@ -107,7 +107,7 @@ static int parse_blkdev_parts(char *blkdev_name, struct parsed_partitions *state return part_nbr; } -int blkdev_partition(struct parsed_partitions *state, struct block_device *bdev) +int blkdev_partition(struct parsed_partitions *state) { char blkdev_name[BDEVNAME_SIZE]; @@ -116,7 +116,7 @@ int blkdev_partition(struct parsed_partitions *state, struct block_device *bdev) return 0; /* Get the name of the blockdevice we are operating upon */ - if (bdevname(bdev, blkdev_name) == NULL) { + if (bdevname(state->bdev, blkdev_name) == NULL) { printk(KERN_WARNING "Could not get a blkdev name\n"); return 0; } diff --git a/fs/partitions/blkdev_parts.h b/fs/partitions/blkdev_parts.h index e6c5d40ed76..16d2b571625 100755 --- a/fs/partitions/blkdev_parts.h +++ b/fs/partitions/blkdev_parts.h @@ -10,5 +10,5 @@ * */ -int blkdev_partition(struct parsed_partitions *state, struct block_device *bdev); +int blkdev_partition(struct parsed_partitions *state); -- cgit v1.2.3