Commit dce14c23 authored by Fabian Frederick's avatar Fabian Frederick Committed by Jens Axboe

block/partitions/msdos.c: code clean-up

checkpatch fixing:
WARNING: Missing a blank line after declarations
WARNING: space prohibited between function name and open parenthesis '('
ERROR: spaces required around that '<' (ctx:VxV)

Cc: Jens Axboe <axboe@kernel.dk>
Cc: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarFabian Frederick <fabf@skynet.be>
Signed-off-by: default avatarJens Axboe <axboe@fb.com>
parent 600ffc5e
...@@ -159,8 +159,9 @@ static void parse_extended(struct parsed_partitions *state, ...@@ -159,8 +159,9 @@ static void parse_extended(struct parsed_partitions *state,
/* /*
* First process the data partition(s) * First process the data partition(s)
*/ */
for (i=0; i<4; i++, p++) { for (i = 0; i < 4; i++, p++) {
sector_t offs, size, next; sector_t offs, size, next;
if (!nr_sects(p) || is_extended_partition(p)) if (!nr_sects(p) || is_extended_partition(p))
continue; continue;
...@@ -194,7 +195,7 @@ static void parse_extended(struct parsed_partitions *state, ...@@ -194,7 +195,7 @@ static void parse_extended(struct parsed_partitions *state,
* It should be a link to the next logical partition. * It should be a link to the next logical partition.
*/ */
p -= 4; p -= 4;
for (i=0; i<4; i++, p++) for (i = 0; i < 4; i++, p++)
if (nr_sects(p) && is_extended_partition(p)) if (nr_sects(p) && is_extended_partition(p))
break; break;
if (i == 4) if (i == 4)
...@@ -243,8 +244,8 @@ static void parse_solaris_x86(struct parsed_partitions *state, ...@@ -243,8 +244,8 @@ static void parse_solaris_x86(struct parsed_partitions *state,
return; return;
} }
/* Ensure we can handle previous case of VTOC with 8 entries gracefully */ /* Ensure we can handle previous case of VTOC with 8 entries gracefully */
max_nparts = le16_to_cpu (v->v_nparts) > 8 ? SOLARIS_X86_NUMSLICE : 8; max_nparts = le16_to_cpu(v->v_nparts) > 8 ? SOLARIS_X86_NUMSLICE : 8;
for (i=0; i<max_nparts && state->next<state->limit; i++) { for (i = 0; i < max_nparts && state->next < state->limit; i++) {
struct solaris_x86_slice *s = &v->v_slice[i]; struct solaris_x86_slice *s = &v->v_slice[i];
char tmp[3 + 10 + 1 + 1]; char tmp[3 + 10 + 1 + 1];
...@@ -409,7 +410,7 @@ static void parse_minix(struct parsed_partitions *state, ...@@ -409,7 +410,7 @@ static void parse_minix(struct parsed_partitions *state,
/* The first sector of a Minix partition can have either /* The first sector of a Minix partition can have either
* a secondary MBR describing its subpartitions, or * a secondary MBR describing its subpartitions, or
* the normal boot sector. */ * the normal boot sector. */
if (msdos_magic_present (data + 510) && if (msdos_magic_present(data + 510) &&
SYS_IND(p) == MINIX_PARTITION) { /* subpartition table present */ SYS_IND(p) == MINIX_PARTITION) { /* subpartition table present */
char tmp[1 + BDEVNAME_SIZE + 10 + 9 + 1]; char tmp[1 + BDEVNAME_SIZE + 10 + 9 + 1];
...@@ -527,6 +528,7 @@ int msdos_partition(struct parsed_partitions *state) ...@@ -527,6 +528,7 @@ int msdos_partition(struct parsed_partitions *state)
for (slot = 1 ; slot <= 4 ; slot++, p++) { for (slot = 1 ; slot <= 4 ; slot++, p++) {
sector_t start = start_sect(p)*sector_size; sector_t start = start_sect(p)*sector_size;
sector_t size = nr_sects(p)*sector_size; sector_t size = nr_sects(p)*sector_size;
if (!size) if (!size)
continue; continue;
if (is_extended_partition(p)) { if (is_extended_partition(p)) {
...@@ -537,6 +539,7 @@ int msdos_partition(struct parsed_partitions *state) ...@@ -537,6 +539,7 @@ int msdos_partition(struct parsed_partitions *state)
* sector, although it may not be enough/proper. * sector, although it may not be enough/proper.
*/ */
sector_t n = 2; sector_t n = 2;
n = min(size, max(sector_size, n)); n = min(size, max(sector_size, n));
put_partition(state, slot, start, n); put_partition(state, slot, start, n);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment