From 95147b1d95585b5e51ed0066ff418bc17bcb0c7d Mon Sep 17 00:00:00 2001 From: Dmitry Lavnikevich Date: Mon, 10 Mar 2014 14:39:51 +0300 Subject: ubi: Fix for creating ubi volumes with 64bit size Since MTD is already supports >= 4GB device sizes it is better to allow ubi valumes also be created of larger sizes. Signed-off-by: Dmitry Lavnikevich Signed-off-by: Grigory Milev Signed-off-by: Sascha Hauer --- commands/ubi.c | 4 ++-- drivers/mtd/ubi/cdev.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/commands/ubi.c b/commands/ubi.c index 57ae79025d..8a409c28a8 100644 --- a/commands/ubi.c +++ b/commands/ubi.c @@ -15,12 +15,12 @@ static int do_ubimkvol(int argc, char *argv[]) { struct ubi_mkvol_req req; int fd, ret; - size_t size; + uint64_t size; if (argc != 4) return COMMAND_ERROR_USAGE; - size = strtoul_suffix(argv[3], NULL, 0); + size = strtoull_suffix(argv[3], NULL, 0); req.name_len = min_t(int, strlen(argv[2]), UBI_VOL_NAME_MAX); strncpy(req.name, argv[2], req.name_len); req.name[req.name_len] = 0; diff --git a/drivers/mtd/ubi/cdev.c b/drivers/mtd/ubi/cdev.c index 4b8eb4c5cf..dcd138f553 100644 --- a/drivers/mtd/ubi/cdev.c +++ b/drivers/mtd/ubi/cdev.c @@ -222,7 +222,7 @@ static int ubi_cdev_ioctl(struct cdev *cdev, int cmd, void *buf) break; case UBI_IOCMKVOL: if (!req->bytes) - req->bytes = ubi->avail_pebs * ubi->leb_size; + req->bytes = (__s64)ubi->avail_pebs * ubi->leb_size; return ubi_create_volume(ubi, req); }; -- cgit v1.2.3