GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-03-31 03:21:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Tom Rini 2018-07-12 09:47:39 -04:00
commit 62a69a6bbb
3 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
cmd/ubi.c
View file

@ -356,6 +356,8 @@ int ubi_volume_read(char *volume, char *buf, size_t size)
size = vol->used_bytes; size = vol->used_bytes;
} }
printf("Read %u bytes from volume %s to %p\n", size, volume, buf);
if (vol->corrupted) if (vol->corrupted)
printf("read from corrupted volume %d", vol->vol_id); printf("read from corrupted volume %d", vol->vol_id);
if (offp + size > vol->used_bytes) if (offp + size > vol->used_bytes)
@ -510,6 +512,7 @@ int ubi_part(char *part_name, const char *vid_header_offset)
vid_header_offset); vid_header_offset);
if (err) { if (err) {
printf("UBI init error %d\n", 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; ubi_dev.selected = 0;
return err; return err;
} }
@ -674,9 +677,6 @@ static int do_ubi(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
} }
if (argc == 3) { 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); return ubi_volume_read(argv[3], (char *)addr, size);
} }
} }

8
fs/ubifs/super.c
View file

@ -2360,7 +2360,9 @@ static struct super_block *alloc_super(struct file_system_type *type, int flags)
return ERR_PTR(err); return ERR_PTR(err);
} }
#ifndef __UBOOT__
INIT_HLIST_NODE(&s->s_instances); INIT_HLIST_NODE(&s->s_instances);
#endif
INIT_LIST_HEAD(&s->s_inodes); INIT_LIST_HEAD(&s->s_inodes);
s->s_time_gran = 1000000000; s->s_time_gran = 1000000000;
s->s_flags = flags; s->s_flags = flags;
@ -2429,14 +2431,12 @@ retry:
#ifndef __UBOOT__ #ifndef __UBOOT__
strlcpy(s->s_id, type->name, sizeof(s->s_id)); strlcpy(s->s_id, type->name, sizeof(s->s_id));
list_add_tail(&s->s_list, &super_blocks); 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); hlist_add_head(&s->s_instances, &type->fs_supers);
#ifndef __UBOOT__
spin_unlock(&sb_lock); spin_unlock(&sb_lock);
get_filesystem(type); get_filesystem(type);
register_shrinker(&s->s_shrink); register_shrinker(&s->s_shrink);
#else
strncpy(s->s_id, type->name, sizeof(s->s_id));
#endif #endif
return s; return s;
} }

2
fs/ubifs/ubifs.h
View file

@ -316,8 +316,8 @@ struct super_block {
struct backing_dev_info *s_bdi; struct backing_dev_info *s_bdi;
#endif #endif
struct mtd_info *s_mtd; struct mtd_info *s_mtd;
struct hlist_node s_instances;
#ifndef __UBOOT__ #ifndef __UBOOT__
struct hlist_node s_instances;
struct quota_info s_dquot; /* Diskquota specific options */ struct quota_info s_dquot; /* Diskquota specific options */
#endif #endif