diff options
| author | Ming Lei <ming.lei@canonical.com> | 2013-02-28 02:05:18 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-02-28 04:10:21 +0100 |
| commit | 06004e6eebdaf101a0f9b533fac77b5768d2c09c (patch) | |
| tree | 5a867e6e20c7fb468ba4d6b7d5501fded8b174f1 /block | |
| parent | block/partitions/efi.c: ensure that the GPT header is at least the size of th... (diff) | |
| download | linux-06004e6eebdaf101a0f9b533fac77b5768d2c09c.tar.xz linux-06004e6eebdaf101a0f9b533fac77b5768d2c09c.zip | |
block/partitions/mac.c: obey the state->limit constraint
It isn't necessary to read the information of partitions whose number is
equal and more than state->limit since only maximum state->limit
partitions will be added inside rescan_partitions().
That is also what other kind of partitions are doing.
Signed-off-by: Ming Lei <ming.lei@canonical.com>
Cc: Jens Axboe <axboe@kernel.dk>
Cc: Yasuaki Ishimatsu <isimatu.yasuaki@jp.fujitsu.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'block')
| -rw-r--r-- | block/partitions/mac.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/block/partitions/mac.c b/block/partitions/mac.c index 11f688bd76c5..76d8ba6379a9 100644 --- a/block/partitions/mac.c +++ b/block/partitions/mac.c @@ -63,6 +63,10 @@ int mac_partition(struct parsed_partitions *state) put_dev_sector(sect); return 0; } + + if (blocks_in_map >= state->limit) + blocks_in_map = state->limit - 1; + strlcat(state->pp_buf, " [mac]", PAGE_SIZE); for (slot = 1; slot <= blocks_in_map; ++slot) { int pos = slot * secsize; |