aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/mtd
diff options
context:
space:
mode:
authorArtem Bityutskiy <artem.bityutskiy@linux.intel.com>2012-08-18 14:11:42 +0200
committerBen Hutchings <ben@decadent.org.uk>2012-10-17 03:48:18 +0100
commitaa85d9855447adcbc162705e922654ff4df96467 (patch)
tree602bde2d037e6a8bb02997c3b8a1a39f5c4b2bea /drivers/mtd
parentf11829e7da3cd59400fe60287a3c3a11a6ddb2ac (diff)
downloadkernel_samsung_smdk4412-aa85d9855447adcbc162705e922654ff4df96467.zip
kernel_samsung_smdk4412-aa85d9855447adcbc162705e922654ff4df96467.tar.gz
kernel_samsung_smdk4412-aa85d9855447adcbc162705e922654ff4df96467.tar.bz2
UBI: fix autoresize handling in R/O mode
commit abb3e01103eb4e2ea5c15e6fedbc74e08bd4cc2b upstream. Currently UBI fails in autoresize when it is in R/O mode (e.g., because the underlying MTD device is R/O). This patch fixes the issue - we just skip autoresize and print a warning. Reported-by: Pali Rohár <pali.rohar@gmail.com> Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com> Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'drivers/mtd')
-rw-r--r--drivers/mtd/ubi/build.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/mtd/ubi/build.c b/drivers/mtd/ubi/build.c
index 6c3fb5a..1f9c363 100644
--- a/drivers/mtd/ubi/build.c
+++ b/drivers/mtd/ubi/build.c
@@ -816,6 +816,11 @@ static int autoresize(struct ubi_device *ubi, int vol_id)
struct ubi_volume *vol = ubi->volumes[vol_id];
int err, old_reserved_pebs = vol->reserved_pebs;
+ if (ubi->ro_mode) {
+ ubi_warn("skip auto-resize because of R/O mode");
+ return 0;
+ }
+
/*
* Clear the auto-resize flag in the volume in-memory copy of the
* volume table, and 'ubi_resize_volume()' will propagate this change