diff options
| author | Tom Rini <trini@konsulko.com> | 2018-07-12 09:47:39 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-07-12 09:47:39 -0400 |
| commit | 62a69a6bbb99dc1880dbb22c9eb5d41f1ec8cb40 (patch) | |
| tree | 8469ae722571c02de90930f864d564522dbec7f9 | |
| parent | 1612ff0dfba57b1002d8c7a54778eb553ace98f4 (diff) | |
| parent | 5a08cfee3967d6e8174d7de135af1daa8e4aea00 (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-ubi
| -rw-r--r-- | cmd/ubi.c | 6 | ||||
| -rw-r--r-- | fs/ubifs/super.c | 8 | ||||
| -rw-r--r-- | fs/ubifs/ubifs.h | 2 |
3 files changed, 8 insertions, 8 deletions
@@ -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 abdef1e6ab..9603163d8a 100644 --- 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 78c3a68216..512fdaa144 100644 --- 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 |