summaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorRobert Rosengren <robert.rosengren@stericsson.com>2010-12-06 13:58:42 +0100
committerPhilippe Langlais <philippe.langlais@linaro.org>2011-05-03 08:25:05 +0200
commit4cf5379cedf44e6419a174b4aeeb7ef40a435fe9 (patch)
tree202b84a16819ce3a9cfb0529beed0130673081b4 /fs
parentfd309bf134bf940e989945fd0988fbd169d2c7f5 (diff)
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 <robert.rosengren@stericsson.com> Reviewed-by: Ulf HANSSON <ulf.hansson@stericsson.com> Reviewed-by: Sebastian RASMUSSEN <sebastian.rasmussen@stericsson.com>
Diffstat (limited to 'fs')
-rwxr-xr-xfs/partitions/blkdev_parts.c4
-rwxr-xr-xfs/partitions/blkdev_parts.h2
2 files changed, 3 insertions, 3 deletions
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);