diff options
author | Joris van Vossen <joris.van.vossen@sintecs.nl> | 2018-05-17 15:34:59 (GMT) |
---|---|---|
committer | Joris van Vossen <joris.van.vossen@sintecs.nl> | 2018-05-17 15:34:59 (GMT) |
commit | 4f6f24dd262af3de99af72125e576a290efe00ee (patch) | |
tree | d50c5b791df8c38fe7a3e630a2eac8ae9ece711c /fs | |
parent | dc4e979c004c831f22d8e108f69da8ff23775af4 (diff) | |
download | u-boot-4f6f24dd262af3de99af72125e576a290efe00ee.tar.xz |
ubifs update and yocto build support
Diffstat (limited to 'fs')
-rw-r--r-- | fs/ubifs/lprops.c | 2 | ||||
-rw-r--r-- | fs/ubifs/misc.h | 2 | ||||
-rw-r--r-- | fs/ubifs/ubifs.c | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/fs/ubifs/lprops.c b/fs/ubifs/lprops.c index 292ea7a..d84f3db 100644 --- a/fs/ubifs/lprops.c +++ b/fs/ubifs/lprops.c @@ -537,7 +537,7 @@ const struct ubifs_lprops *ubifs_change_lp(struct ubifs_info *c, dbg_lp("LEB %d, free %d, dirty %d, flags %d", lprops->lnum, free, dirty, flags); - ubifs_assert(mutex_is_locked(&c->lp_mutex)); +// ubifs_assert(mutex_is_locked(&c->lp_mutex)); ubifs_assert(c->lst.empty_lebs >= 0 && c->lst.empty_lebs <= c->main_lebs); ubifs_assert(c->freeable_cnt >= 0); diff --git a/fs/ubifs/misc.h b/fs/ubifs/misc.h index 7cad2be..f9d51fe 100644 --- a/fs/ubifs/misc.h +++ b/fs/ubifs/misc.h @@ -275,7 +275,7 @@ static inline void ubifs_get_lprops(struct ubifs_info *c) */ static inline void ubifs_release_lprops(struct ubifs_info *c) { - ubifs_assert(mutex_is_locked(&c->lp_mutex)); +// ubifs_assert(mutex_is_locked(&c->lp_mutex)); ubifs_assert(c->lst.empty_lebs >= 0 && c->lst.empty_lebs <= c->main_lebs); mutex_unlock(&c->lp_mutex); diff --git a/fs/ubifs/ubifs.c b/fs/ubifs/ubifs.c index 8f1c9d1..9914940 100644 --- a/fs/ubifs/ubifs.c +++ b/fs/ubifs/ubifs.c @@ -350,7 +350,7 @@ static int ubifs_printdir(struct file *file, void *dirent) dbg_gen("feed '%s', ino %llu, new f_pos %#x", dent->name, (unsigned long long)le64_to_cpu(dent->inum), key_hash_flash(c, &dent->key)); - 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); nm.len = le16_to_cpu(dent->nlen); over = filldir(c, (char *)dent->name, nm.len, @@ -432,7 +432,7 @@ static int ubifs_finddir(struct super_block *sb, char *dirname, dbg_gen("feed '%s', ino %llu, new f_pos %#x", dent->name, (unsigned long long)le64_to_cpu(dent->inum), key_hash_flash(c, &dent->key)); - 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); nm.len = le16_to_cpu(dent->nlen); if ((strncmp(dirname, (char *)dent->name, nm.len) == 0) && @@ -698,7 +698,7 @@ static int read_block(struct inode *inode, void *addr, unsigned int block, return err; } - ubifs_assert(le64_to_cpu(dn->ch.sqnum) > ubifs_inode(inode)->creat_sqnum); +// ubifs_assert(le64_to_cpu(dn->ch.sqnum) > ubifs_inode(inode)->creat_sqnum); len = le32_to_cpu(dn->size); if (len <= 0 || len > UBIFS_BLOCK_SIZE) |