aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArtem Bityutskiy <[email protected]>2012-08-18 14:11:42 +0200
committerArtem Bityutskiy <[email protected]>2012-09-04 09:39:01 +0300
commitabb3e01103eb4e2ea5c15e6fedbc74e08bd4cc2b (patch)
treea83d9e615df93b083d6018b0bf5dea3f7f25bdf0
parentdb7e21c21f293d52f5363fe8d9ee91d6bd0a503a (diff)
UBI: fix autoresize handling in R/O mode
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 <[email protected]> Cc: [email protected] Signed-off-by: Artem Bityutskiy <[email protected]>
-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 355756bd37ab..89660881aa31 100644
--- a/drivers/mtd/ubi/build.c
+++ b/drivers/mtd/ubi/build.c
@@ -799,6 +799,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