From: Huang Shijie <b32955@freescale.com>
To: <dedekind1@gmail.com>
Cc: linux-mtd@lists.infradead.org, dwmw2@infradead.org,
shmulik.ladkani@gmail.com, Huang Shijie <b32955@freescale.com>
Subject: [PATCH v2 1/3] mtd: cmdlinepart: sort the unsorted partitions
Date: Tue, 4 Sep 2012 15:43:46 +0800 [thread overview]
Message-ID: <1346744628-13840-1-git-send-email-b32955@freescale.com> (raw)
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(-)
diff --git a/drivers/mtd/cmdlinepart.c b/drivers/mtd/cmdlinepart.c
index 17b0bd4..dde8e84 100644
--- a/drivers/mtd/cmdlinepart.c
+++ b/drivers/mtd/cmdlinepart.c
@@ -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;
--
1.7.0.4
next reply other threads:[~2012-09-04 8:06 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-04 7:43 Huang Shijie [this message]
2012-09-04 7:43 ` [PATCH v2 2/3] mtd: cmdlinepart: fix the wrong partitions number when truncating occurs Huang Shijie
2012-09-04 7:43 ` [PATCH v2 3/3] mtd: cmdlinepart: check the partitions Huang Shijie
2012-09-04 8:19 ` Artem Bityutskiy
2012-09-04 8:25 ` Huang Shijie
2012-09-04 8:50 ` Artem Bityutskiy
2012-09-04 9:07 ` [PATCH v3] " Huang Shijie
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1346744628-13840-1-git-send-email-b32955@freescale.com \
--to=b32955@freescale.com \
--cc=dedekind1@gmail.com \
--cc=dwmw2@infradead.org \
--cc=linux-mtd@lists.infradead.org \
--cc=shmulik.ladkani@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox