From 88217613019427c8e96c80e277c0652f468f54c9 Mon Sep 17 00:00:00 2001 From: Sebastian Rasmussen Date: Thu, 2 Dec 2010 11:34:52 +0100 Subject: fs/partitions: Adapt blkdevparts to new interface ST-Ericsson ID: ER[0-9]\{6\} ST-Ericsson FOSS-OUT ID: Trivial Change-Id: I20daba4ceaf0837335d8cdbeaed996287aafe3f6 Signed-off-by: Sebastian Rasmussen Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/9830 Reviewed-by: Linus WALLEIJ Tested-by: Marcus GORANSSON --- 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