Merge branch 'master' of git://git.denx.de/u-boot-ubi

diff --git a/cmd/ubi.c b/cmd/ubi.c
index ac9a582437d603039ec722db30d32187dd1181c4..0e935e34b8e626fb5ec916109ae013aee07e3048 100644 (file)
--- a/cmd/ubi.c
+++ b/cmd/ubi.c
@@ -356,6 +356,8 @@ int ubi_volume_read(char *volume, char *buf, size_t size)
                size = vol->used_bytes;
        }
 
+       printf("Read %u bytes from volume %s to %p\n", size, volume, buf);
+
        if (vol->corrupted)
                printf("read from corrupted volume %d", vol->vol_id);
        if (offp + size > vol->used_bytes)
@@ -510,6 +512,7 @@ int ubi_part(char *part_name, const char *vid_header_offset)
                        vid_header_offset);
        if (err) {
                printf("UBI init error %d\n", err);
+               printf("Please check, if the correct MTD partition is used (size big enough?)\n");
                ubi_dev.selected = 0;
                return err;
        }
@@ -674,9 +677,6 @@ static int do_ubi(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
                }
 
                if (argc == 3) {
-                       printf("Read %lld bytes from volume %s to %lx\n", size,
-                              argv[3], addr);
-
                        return ubi_volume_read(argv[3], (char *)addr, size);
                }
        }

diff --git a/fs/ubifs/super.c b/fs/ubifs/super.c
index abdef1e6ab8db78ac47044419dc47f1c57eec640..9603163d8a04129f3017c500ad668344e5872168 100644 (file)
--- a/fs/ubifs/super.c
+++ b/fs/ubifs/super.c
@@ -2360,7 +2360,9 @@ static struct super_block *alloc_super(struct file_system_type *type, int flags)
                return ERR_PTR(err);
        }
 
+#ifndef __UBOOT__
        INIT_HLIST_NODE(&s->s_instances);
+#endif
        INIT_LIST_HEAD(&s->s_inodes);
        s->s_time_gran = 1000000000;
        s->s_flags = flags;
@@ -2429,14 +2431,12 @@ retry:
 #ifndef __UBOOT__
        strlcpy(s->s_id, type->name, sizeof(s->s_id));
        list_add_tail(&s->s_list, &super_blocks);
-#else
-       strncpy(s->s_id, type->name, sizeof(s->s_id));
-#endif
        hlist_add_head(&s->s_instances, &type->fs_supers);
-#ifndef __UBOOT__
        spin_unlock(&sb_lock);
        get_filesystem(type);
        register_shrinker(&s->s_shrink);
+#else
+       strncpy(s->s_id, type->name, sizeof(s->s_id));
 #endif
        return s;
 }

diff --git a/fs/ubifs/ubifs.h b/fs/ubifs/ubifs.h
index 78c3a68216e120a41d2b00b47b5bf7c55bdf69a8..512fdaa1444d1155bcf260be3156c19ce65578d1 100644 (file)
--- a/fs/ubifs/ubifs.h
+++ b/fs/ubifs/ubifs.h
@@ -316,8 +316,8 @@ struct super_block {
        struct backing_dev_info *s_bdi;
 #endif
        struct mtd_info         *s_mtd;
-       struct hlist_node       s_instances;
 #ifndef __UBOOT__
+       struct hlist_node       s_instances;
        struct quota_info       s_dquot;        /* Diskquota specific options */
 #endif