@@ -205,6 +205,26 @@ static struct mtd_partition * newpart(char *s,
return parts;
}
+/* There are only several partitions, so the Bubble sort is enough. */
+static inline void sort_partitons(struct mtd_partition *parts, int num_parts)
+{
+ int i, j;
+
+ /* sort by the offset */
+ for (i = 0; i < num_parts - 1; i++) {
+ for (j = 1; j < num_parts - i; j++) {
+ if (parts[j - 1].offset > parts[j].offset) {
+ struct mtd_partition tmp;
+
+ tmp = parts[j - 1];
+ parts[j - 1] = parts[j];
+ parts[j] = tmp;
+ }
+ }
+ }
+ return;
+}
+
/*
* Parse the command line.
*/
@@ -262,6 +282,9 @@ static int mtdpart_setup_real(char *s)
this_mtd->mtd_id = (char*)(this_mtd + 1);
strlcpy(this_mtd->mtd_id, mtd_id, mtd_id_len + 1);
+ /* sort the partitions */
+ sort_partitons(parts, num_parts);
+
/* link into chain */
this_mtd->next = partitions;
partitions = this_mtd;
Assume we have a 1GB(8Gb) nand chip. It is legit if we set the partitions as the following: gpmi-nand:1g@200m(rootfs),100m@0(boot),100m@100m(kernel) Unfortunately, the current code can not parse out any partition with this cmdline. The parse_cmdline_partitions() will meet the truncated partition `rootfs` firstly. But the parse_cmdline_partitions() will break its `for` loop with the following line when the truncating occurs. ........................... part->num_parts = i; ........................... What's worse is that this line has a bug in it. It accidently misses the truncated partitions. So we can not parse out any partition. In this case, we should parse out the `boot` and `kernel` partitions at least. So we need to sort the unsorted partitions. With the sorted partitions, the parse_cmdline_partitions() can parse out the `boot` and `kernel` successfully. This patch sorts the unsorted partitions by the @offset. For there are maybe only several partitions, so the Bubble sort algorithm is enough. We also need another patch to fix the missed truncated partition issue. Signed-off-by: Huang Shijie <b32955@freescale.com> --- drivers/mtd/cmdlinepart.c | 23 +++++++++++++++++++++++ 1 files changed, 23 insertions(+), 0 deletions(-)