]> err.no Git - linux-2.6/commitdiff
[MTD] Disconnect struct mtd_info from ABI
authorJoern Engel <joern@wh.fh-wedel.de>
Tue, 30 May 2006 12:25:35 +0000 (14:25 +0200)
committerJoern Engel <joern@wh.fh-wedel.de>
Tue, 30 May 2006 12:25:35 +0000 (14:25 +0200)
mtdchar.c direcly copied part of struct mtd_info to userspace, thereby
implicitly making it part of the ABI.  With this patch, struct
mtd_info is independent of the ABI and can have its fields removed,
reordered, etc.

Signed-off-by: Joern Engel <joern@wh.fh-wedel.de>
drivers/mtd/mtdchar.c

index fdc535b22e39a9f3ed0c121d37fe3904babe790d..5dd0b8d72c8b67b3fd6a8183eb60f9321cce3226 100644 (file)
@@ -380,6 +380,7 @@ static int mtd_ioctl(struct inode *inode, struct file *file,
        void __user *argp = (void __user *)arg;
        int ret = 0;
        u_long size;
+       struct mtd_info_user info;
 
        DEBUG(MTD_DEBUG_LEVEL0, "MTD_ioctl\n");
 
@@ -415,7 +416,15 @@ static int mtd_ioctl(struct inode *inode, struct file *file,
        }
 
        case MEMGETINFO:
-               if (copy_to_user(argp, mtd, sizeof(struct mtd_info_user)))
+               info.type       = mtd->type;
+               info.flags      = mtd->flags;
+               info.size       = mtd->size;
+               info.erasesize  = mtd->erasesize;
+               info.writesize  = mtd->writesize;
+               info.oobsize    = mtd->oobsize;
+               info.ecctype    = mtd->ecctype;
+               info.eccsize    = mtd->eccsize;
+               if (copy_to_user(argp, &info, sizeof(struct mtd_info_user)))
                        return -EFAULT;
                break;