diff options
Diffstat (limited to 'block/partitions/msdos.c')
-rw-r--r-- | block/partitions/msdos.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/block/partitions/msdos.c b/block/partitions/msdos.c index 7681cd295ab8..9bf19e6fd949 100644 --- a/block/partitions/msdos.c +++ b/block/partitions/msdos.c | |||
@@ -90,7 +90,7 @@ static int aix_magic_present(struct parsed_partitions *state, unsigned char *p) | |||
90 | if (d[0] == '_' && d[1] == 'L' && d[2] == 'V' && d[3] == 'M') | 90 | if (d[0] == '_' && d[1] == 'L' && d[2] == 'V' && d[3] == 'M') |
91 | ret = 1; | 91 | ret = 1; |
92 | put_dev_sector(sect); | 92 | put_dev_sector(sect); |
93 | }; | 93 | } |
94 | return ret; | 94 | return ret; |
95 | } | 95 | } |
96 | 96 | ||
@@ -142,7 +142,7 @@ static void parse_extended(struct parsed_partitions *state, | |||
142 | return; | 142 | return; |
143 | 143 | ||
144 | if (!msdos_magic_present(data + 510)) | 144 | if (!msdos_magic_present(data + 510)) |
145 | goto done; | 145 | goto done; |
146 | 146 | ||
147 | p = (struct partition *) (data + 0x1be); | 147 | p = (struct partition *) (data + 0x1be); |
148 | 148 | ||
@@ -155,7 +155,7 @@ static void parse_extended(struct parsed_partitions *state, | |||
155 | * and OS/2 seems to use all four entries. | 155 | * and OS/2 seems to use all four entries. |
156 | */ | 156 | */ |
157 | 157 | ||
158 | /* | 158 | /* |
159 | * First process the data partition(s) | 159 | * First process the data partition(s) |
160 | */ | 160 | */ |
161 | for (i=0; i<4; i++, p++) { | 161 | for (i=0; i<4; i++, p++) { |
@@ -263,7 +263,7 @@ static void parse_solaris_x86(struct parsed_partitions *state, | |||
263 | } | 263 | } |
264 | 264 | ||
265 | #if defined(CONFIG_BSD_DISKLABEL) | 265 | #if defined(CONFIG_BSD_DISKLABEL) |
266 | /* | 266 | /* |
267 | * Create devices for BSD partitions listed in a disklabel, under a | 267 | * Create devices for BSD partitions listed in a disklabel, under a |
268 | * dos-like partition. See parse_extended() for more information. | 268 | * dos-like partition. See parse_extended() for more information. |
269 | */ | 269 | */ |
@@ -294,7 +294,7 @@ static void parse_bsd(struct parsed_partitions *state, | |||
294 | 294 | ||
295 | if (state->next == state->limit) | 295 | if (state->next == state->limit) |
296 | break; | 296 | break; |
297 | if (p->p_fstype == BSD_FS_UNUSED) | 297 | if (p->p_fstype == BSD_FS_UNUSED) |
298 | continue; | 298 | continue; |
299 | bsd_start = le32_to_cpu(p->p_offset); | 299 | bsd_start = le32_to_cpu(p->p_offset); |
300 | bsd_size = le32_to_cpu(p->p_size); | 300 | bsd_size = le32_to_cpu(p->p_size); |
@@ -441,7 +441,7 @@ static struct { | |||
441 | {NEW_SOLARIS_X86_PARTITION, parse_solaris_x86}, | 441 | {NEW_SOLARIS_X86_PARTITION, parse_solaris_x86}, |
442 | {0, NULL}, | 442 | {0, NULL}, |
443 | }; | 443 | }; |
444 | 444 | ||
445 | int msdos_partition(struct parsed_partitions *state) | 445 | int msdos_partition(struct parsed_partitions *state) |
446 | { | 446 | { |
447 | sector_t sector_size = bdev_logical_block_size(state->bdev) / 512; | 447 | sector_t sector_size = bdev_logical_block_size(state->bdev) / 512; |