mtd, ubi, ubifs: update for the sync with linux v3.14

[karo-tx-uboot.git] / fs / ubifs / super.c

diff --git a/fs/ubifs/super.c b/fs/ubifs/super.c
index 9c87db40d3838c4dd271460884b4c293c3f4e14e..5f536914283c496dc34c7c540d5287ec14ada37b 100644 (file)
--- 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;