summaryrefslogtreecommitdiffstats
path: root/fs/ubifs
diff options
context:
space:
mode:
authorHeiko Schocher <hs@denx.de>2014-07-15 16:08:42 +0200
committerTom Rini <trini@ti.com>2014-08-25 19:25:56 -0400
commitddf7bcfa6c5a1d9647046c18e4945f0b0686aec5 (patch)
tree5aacb15745d27f8a2a9565b4441f4170817841cc /fs/ubifs
parentff94bc40af3481d47546595ba73c136de6af6929 (diff)
downloadblackbird-obmc-uboot-ddf7bcfa6c5a1d9647046c18e4945f0b0686aec5.tar.gz
blackbird-obmc-uboot-ddf7bcfa6c5a1d9647046c18e4945f0b0686aec5.zip
mtd, ubi, ubifs: update for the sync with linux v3.14
while playing with the new mtd/ubi/ubifs sync, found some small updates for it: - add del_mtd_partition() to include/linux/mtd/mtd - mtd: add a debug_printf - remove some not used functions Signed-off-by: Heiko Schocher <hs@denx.de> Cc: Scott Wood <scottwood@freescale.com> Cc: Tom Rini <trini@ti.com>
Diffstat (limited to 'fs/ubifs')
-rw-r--r--fs/ubifs/super.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/fs/ubifs/super.c b/fs/ubifs/super.c
index 9c87db40d3..5f53691428 100644
--- a/fs/ubifs/super.c
+++ b/fs/ubifs/super.c
@@ -2241,8 +2241,14 @@ static int ubifs_fill_super(struct super_block *sb, void *data, int silent)
int err;
c->vfs_sb = sb;
+#ifndef __UBOOT__
/* Re-open the UBI device in read-write mode */
c->ubi = ubi_open_volume(c->vi.ubi_num, c->vi.vol_id, UBI_READWRITE);
+#else
+ /* U-Boot read only mode */
+ c->ubi = ubi_open_volume(c->vi.ubi_num, c->vi.vol_id, UBI_READONLY);
+#endif
+
if (IS_ERR(c->ubi)) {
err = PTR_ERR(c->ubi);
goto out;
OpenPOWER on IntegriCloud