From: Joel Stanley <j...@jms.id.au>

This reverts commit f2538f999345405f7d2e1194c0c8efa4e11f7b3a. The patch
stopped JFFS2 from being able to mount an existing filesystem with the
following errors:

 jffs2: error: (77) jffs2_build_inode_fragtree: Add node to tree failed -22
 jffs2: error: (77) jffs2_do_read_inode_internal: Failed to build final 
fragtree for inode #5377: error -22

Fixes: f2538f999345 ("jffs2: Fix possible null-pointer dereferences...")
Cc: sta...@vger.kernel.org
Suggested-by: Hou Tao <hout...@huawei.com>
Signed-off-by: Joel Stanley <j...@jms.id.au>
Signed-off-by: Richard Weinberger <rich...@nod.at>
---
 cpukit/libfs/src/jffs2/src/nodelist.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cpukit/libfs/src/jffs2/src/nodelist.c 
b/cpukit/libfs/src/jffs2/src/nodelist.c
index 86dd8e60d1..ee44024c92 100644
--- a/cpukit/libfs/src/jffs2/src/nodelist.c
+++ b/cpukit/libfs/src/jffs2/src/nodelist.c
@@ -228,7 +228,7 @@ static int jffs2_add_frag_to_fragtree(struct jffs2_sb_info 
*c, struct rb_root *r
                lastend = this->ofs + this->size;
        } else {
                dbg_fragtree2("lookup gave no frag\n");
-               return -EINVAL;
+               lastend = 0;
        }
 
        /* See if we ran off the end of the fragtree */
-- 
2.35.3

_______________________________________________
devel mailing list
devel@rtems.org
http://lists.rtems.org/mailman/listinfo/devel

Reply via email to