From: Dan Ehrenberg <dehrenberg@chromium.org>
To: computersforpeace@gmail.com, linux-mtd@lists.infradead.org,
ezequiel@vanguardiasur.com.ar,
Richard Weinberger <richard@nod.at>
Cc: gwendal@chromium.org, Dan Ehrenberg <dehrenberg@chromium.org>
Subject: [PATCH v5 3/3] mtd: part: Remove partition overlap checks
Date: Thu, 2 Apr 2015 15:15:12 -0700 [thread overview]
Message-ID: <1428012912-17551-4-git-send-email-dehrenberg@chromium.org> (raw)
In-Reply-To: <1428012912-17551-1-git-send-email-dehrenberg@chromium.org>
This patch makes MTD dynamic partitioning more flexible by removing
overlap checks for dynamic partitions. I don't see any particular
reason why overlapping dynamic partitions should be prohibited while
static partitions are allowed to overlap freely.
The checks previously had an off-by-one error, where 'end' should be
one less than what it is currently set at, and adding partitions out of
increasing order will fail. Disabling the checks resolves this issue.
Signed-off-by: Dan Ehrenberg <dehrenberg@chromium.org>
---
drivers/mtd/mtdpart.c | 21 +--------------------
1 file changed, 1 insertion(+), 20 deletions(-)
diff --git a/drivers/mtd/mtdpart.c b/drivers/mtd/mtdpart.c
index be80340..cafdb88 100644
--- a/drivers/mtd/mtdpart.c
+++ b/drivers/mtd/mtdpart.c
@@ -582,8 +582,7 @@ int mtd_add_partition(struct mtd_info *master, const char *name,
long long offset, long long length)
{
struct mtd_partition part;
- struct mtd_part *p, *new;
- uint64_t start, end;
+ struct mtd_part *new;
int ret = 0;
/* the direct offset is expected */
@@ -607,21 +606,7 @@ int mtd_add_partition(struct mtd_info *master, const char *name,
if (IS_ERR(new))
return PTR_ERR(new);
- start = offset;
- end = offset + length;
-
mutex_lock(&mtd_partitions_mutex);
- list_for_each_entry(p, &mtd_partitions, list)
- if (p->master == master) {
- if ((start >= p->offset) &&
- (start < (p->offset + p->mtd.size)))
- goto err_inv;
-
- if ((end >= p->offset) &&
- (end < (p->offset + p->mtd.size)))
- goto err_inv;
- }
-
list_add(&new->list, &mtd_partitions);
mutex_unlock(&mtd_partitions_mutex);
@@ -630,10 +615,6 @@ int mtd_add_partition(struct mtd_info *master, const char *name,
mtd_add_partition_attrs(new);
return ret;
-err_inv:
- mutex_unlock(&mtd_partitions_mutex);
- free_partition(new);
- return -EINVAL;
}
EXPORT_SYMBOL_GPL(mtd_add_partition);
--
2.2.0.rc0.207.ga3a616c
next prev parent reply other threads:[~2015-04-02 22:15 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-04-02 22:15 [PATCH v5 0/3] Improve MTD dynamic partitioning support Dan Ehrenberg
2015-04-02 22:15 ` [PATCH v5 1/3] mtd: part: Create the master device node when partitioned Dan Ehrenberg
2015-04-02 22:15 ` [PATCH v5 2/3] mtd: part: Add sysfs variable for offset of partition Dan Ehrenberg
2015-04-02 22:15 ` Dan Ehrenberg [this message]
2015-04-06 0:56 ` [PATCH v5 0/3] Improve MTD dynamic partitioning support Brian Norris
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=1428012912-17551-4-git-send-email-dehrenberg@chromium.org \
--to=dehrenberg@chromium.org \
--cc=computersforpeace@gmail.com \
--cc=ezequiel@vanguardiasur.com.ar \
--cc=gwendal@chromium.org \
--cc=linux-mtd@lists.infradead.org \
--cc=richard@nod.at \
/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;
as well as URLs for NNTP newsgroup(s).