From f573303ad8e5a4492d6666c07ba918c66b53e02e Mon Sep 17 00:00:00 2001
From: Roman Tereshonkov <roman.tereshonkov@nokia.com>
Date: Tue, 23 Nov 2010 14:17:17 +0200
Subject: [PATCH] --- yaml --- r: 231687 b: refs/heads/master c:
 a7e93dcd9aacb3ef4acfcc4310577f3ae0741821 h: refs/heads/master i:   231685:
 e2eee57157db365b0dfa1de47c4ac811969972ef   231683:
 706d0673b0b329f8420a9352c5660da2619ec649   231679:
 3390df45e2233295ffab25137bb13e49580fb2ca v: v3

---
 [refs]                               |  2 +-
 trunk/drivers/mtd/mtdchar.c          |  8 ++++----
 trunk/drivers/mtd/mtdpart.c          | 10 +++++-----
 trunk/include/linux/mtd/partitions.h |  2 +-
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/[refs] b/[refs]
index eff621eb02f9..eedf24df8e20 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e14feafbe0d5c6d64bb6fe4eba928cb57ac9a4c8
+refs/heads/master: a7e93dcd9aacb3ef4acfcc4310577f3ae0741821
diff --git a/trunk/drivers/mtd/mtdchar.c b/trunk/drivers/mtd/mtdchar.c
index cad8fcc7b239..16de17b5b829 100644
--- a/trunk/drivers/mtd/mtdchar.c
+++ b/trunk/drivers/mtd/mtdchar.c
@@ -522,10 +522,6 @@ static int mtd_blkpg_ioctl(struct mtd_info *mtd,
 	if (!capable(CAP_SYS_ADMIN))
 		return -EPERM;
 
-	/* Only master mtd device must be used to control partitions */
-	if (!mtd_is_master(mtd))
-		return -EINVAL;
-
 	if (copy_from_user(&a, arg, sizeof(struct blkpg_ioctl_arg)))
 		return -EFAULT;
 
@@ -535,6 +531,10 @@ static int mtd_blkpg_ioctl(struct mtd_info *mtd,
 	switch (a.op) {
 	case BLKPG_ADD_PARTITION:
 
+		/* Only master mtd device must be used to add partitions */
+		if (mtd_is_partition(mtd))
+			return -EINVAL;
+
 		return mtd_add_partition(mtd, p.devname, p.start, p.length);
 
 	case BLKPG_DEL_PARTITION:
diff --git a/trunk/drivers/mtd/mtdpart.c b/trunk/drivers/mtd/mtdpart.c
index 79e3689f1e16..1047ff0a4f55 100644
--- a/trunk/drivers/mtd/mtdpart.c
+++ b/trunk/drivers/mtd/mtdpart.c
@@ -720,19 +720,19 @@ int parse_mtd_partitions(struct mtd_info *master, const char **types,
 }
 EXPORT_SYMBOL_GPL(parse_mtd_partitions);
 
-int mtd_is_master(struct mtd_info *mtd)
+int mtd_is_partition(struct mtd_info *mtd)
 {
 	struct mtd_part *part;
-	int nopart = 0;
+	int ispart = 0;
 
 	mutex_lock(&mtd_partitions_mutex);
 	list_for_each_entry(part, &mtd_partitions, list)
 		if (&part->mtd == mtd) {
-			nopart = 1;
+			ispart = 1;
 			break;
 		}
 	mutex_unlock(&mtd_partitions_mutex);
 
-	return nopart;
+	return ispart;
 }
-EXPORT_SYMBOL_GPL(mtd_is_master);
+EXPORT_SYMBOL_GPL(mtd_is_partition);
diff --git a/trunk/include/linux/mtd/partitions.h b/trunk/include/linux/mtd/partitions.h
index 2b54316591d2..4a0a8ba90a72 100644
--- a/trunk/include/linux/mtd/partitions.h
+++ b/trunk/include/linux/mtd/partitions.h
@@ -89,7 +89,7 @@ static inline int mtd_has_cmdlinepart(void) { return 1; }
 static inline int mtd_has_cmdlinepart(void) { return 0; }
 #endif
 
-int mtd_is_master(struct mtd_info *mtd);
+int mtd_is_partition(struct mtd_info *mtd);
 int mtd_add_partition(struct mtd_info *master, char *name,
 		      long long offset, long long length);
 int mtd_del_partition(struct mtd_info *master, int partno);