dany/u-boot-megous
1
0
Fork 0
mirror of https://xff.cz/git/u-boot/ synced 2025-09-05 10:42:10 +02:00
Code Issues Packages Projects Releases Wiki Activity

ubifs: avoid assert failed in ubifs.c

Browse Source 
This patch solves assert failed displayed in the console during a boot.
The root cause is that the ubifs_inode is not already allocated when
ubifs_printdir and ubifs_finddir functions are called.

Trace showing the issue:
feed 'boot.scr.uimg', ino 94, new f_pos 0x17b40ece
dent->ch.sqnum '7132', creat_sqnum 3886945402880
UBIFS assert failed in ubifs_finddir at 436
INODE ALLOCATION: creat_sqnum '7129'
Found U-Boot script /boot.scr.uimg

Signed-off-by: Christophe Kerello <christophe.kerello@st.com>
Signed-off-by: Patrice Chotard <patrice.chotard@st.com>
This commit is contained in:
Patrice Chotard
2018-04-27 15:51:23 +02:00
committed by Heiko Schocher
parent cc95535867
commit 87deefeccc
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
fs/ubifs/ubifs.c
View File

@@ -349,7 +349,9 @@ static int ubifs_printdir(struct file *file, void *dirent)
dbg_gen("feed '%s', ino %llu, new f_pos %#x", dbg_gen("feed '%s', ino %llu, new f_pos %#x",
dent->name, (unsigned long long)le64_to_cpu(dent->inum), dent->name, (unsigned long long)le64_to_cpu(dent->inum),
key_hash_flash(c, &dent->key)); key_hash_flash(c, &dent->key));
#ifndef __UBOOT__
ubifs_assert(le64_to_cpu(dent->ch.sqnum) > ubifs_inode(dir)->creat_sqnum); ubifs_assert(le64_to_cpu(dent->ch.sqnum) > ubifs_inode(dir)->creat_sqnum);
#endif
nm.len = le16_to_cpu(dent->nlen); nm.len = le16_to_cpu(dent->nlen);
over = filldir(c, (char *)dent->name, nm.len, over = filldir(c, (char *)dent->name, nm.len,
@@ -431,7 +433,9 @@ static int ubifs_finddir(struct super_block *sb, char *dirname,
dbg_gen("feed '%s', ino %llu, new f_pos %#x", dbg_gen("feed '%s', ino %llu, new f_pos %#x",
dent->name, (unsigned long long)le64_to_cpu(dent->inum), dent->name, (unsigned long long)le64_to_cpu(dent->inum),
key_hash_flash(c, &dent->key)); key_hash_flash(c, &dent->key));
#ifndef __UBOOT__
ubifs_assert(le64_to_cpu(dent->ch.sqnum) > ubifs_inode(dir)->creat_sqnum); ubifs_assert(le64_to_cpu(dent->ch.sqnum) > ubifs_inode(dir)->creat_sqnum);
#endif
nm.len = le16_to_cpu(dent->nlen); nm.len = le16_to_cpu(dent->nlen);
if ((strncmp(dirname, (char *)dent->name, nm.len) == 0) && if ((strncmp(dirname, (char *)dent->name, nm.len) == 0) &&