Merge git://git.denx.de/u-boot-ubi
This commit is contained in:
@@ -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) &&
|
||||||
|
|||||||
Reference in New Issue
Block a user