[PATCH] ubifs: remove wrong assertion

Sascha Hauer s.hauer at pengutronix.de
Thu Dec 10 04:21:48 EST 2020


In barebox copy_znode() doesn't make a copy of the znode, We are limited
to readonly support, so copy_znode() returns the original node.
tnc_delete() expects a znode to be dirty and has an assertion for this.
In a normal r/w implementation this is correct, but not in barebox, so
drop the assertion. Instead of removing it just comment it out to make
sure it won't be added again with the next ubifs kernel synchronisation.

Signed-off-by: Sascha Hauer <s.hauer at pengutronix.de>
---
 fs/ubifs/tnc.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/fs/ubifs/tnc.c b/fs/ubifs/tnc.c
index 2d7327ad84..72f9b817d8 100644
--- a/fs/ubifs/tnc.c
+++ b/fs/ubifs/tnc.c
@@ -1935,7 +1935,12 @@ static int tnc_delete(struct ubifs_info *c, struct ubifs_znode *znode, int n)
 
 	do {
 		ubifs_assert(c, !ubifs_zn_obsolete(znode));
-		ubifs_assert(c, ubifs_zn_dirty(znode));
+		/*
+		 * This assertion is invalid in barebox due to the shortcuts we take
+		 * in our readonly implementation.
+		 *
+		 * ubifs_assert(c, ubifs_zn_dirty(znode));
+		 */
 
 		zp = znode->parent;
 		n = znode->iip;
-- 
2.20.1




More information about the barebox mailing list