From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-ig0-x22f.google.com ([2607:f8b0:4001:c05::22f]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1YdnOq-0002AB-ON for linux-mtd@lists.infradead.org; Thu, 02 Apr 2015 22:15:45 +0000 Received: by igbqf9 with SMTP id qf9so84641210igb.1 for ; Thu, 02 Apr 2015 15:15:23 -0700 (PDT) Sender: Daniel Ehrenberg From: Dan Ehrenberg To: computersforpeace@gmail.com, linux-mtd@lists.infradead.org, ezequiel@vanguardiasur.com.ar, Richard Weinberger Subject: [PATCH v5 3/3] mtd: part: Remove partition overlap checks Date: Thu, 2 Apr 2015 15:15:12 -0700 Message-Id: <1428012912-17551-4-git-send-email-dehrenberg@chromium.org> In-Reply-To: <1428012912-17551-1-git-send-email-dehrenberg@chromium.org> References: <1428012912-17551-1-git-send-email-dehrenberg@chromium.org> Cc: gwendal@chromium.org, Dan Ehrenberg List-Id: Linux MTD discussion mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , 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 --- 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